diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-13 21:49:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-13 21:49:03 -0400 |
| commit | 60e19518d657018c4e25f0c20ca4f623536714b5 (patch) | |
| tree | 4775d80b915310e094581dea09bbac54122b7f6a /tools/perf/scripts/python/netdev-times.py | |
| parent | Merge tag 'wireless-drivers-for-davem-2016-04-13' of git://git.kernel.org/pub... (diff) | |
| parent | netfilter: ebtables: Fix extension lookup with identical name (diff) | |
| download | linux-60e19518d657018c4e25f0c20ca4f623536714b5.tar.gz linux-60e19518d657018c4e25f0c20ca4f623536714b5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree. More
specifically, they are:
1) Fix missing filter table per-netns registration in arptables, from
Florian Westphal.
2) Resolve out of bound access when parsing TCP options in
nf_conntrack_tcp, patch from Jozsef Kadlecsik.
3) Prefer NFPROTO_BRIDGE extensions over NFPROTO_UNSPEC in ebtables,
this resolves conflict between xt_limit and ebt_limit, from Phil Sutter.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/netdev-times.py')
0 files changed, 0 insertions, 0 deletions