summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-14 01:49:03 (GMT)
committerDavid S. Miller <davem@davemloft.net>2016-04-14 01:49:03 (GMT)
commit60e19518d657018c4e25f0c20ca4f623536714b5 (patch)
tree4775d80b915310e094581dea09bbac54122b7f6a /init
parent4bc0eb3a1b20facbbf5c4939df863d8928e5c1b7 (diff)
parentbcf4934288402be3464110109a4dae3bd6fb3e93 (diff)
downloadlinux-60e19518d657018c4e25f0c20ca4f623536714b5.tar.xz
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 'init')
0 files changed, 0 insertions, 0 deletions