tree 4775d80b915310e094581dea09bbac54122b7f6a
parent 4bc0eb3a1b20facbbf5c4939df863d8928e5c1b7
parent bcf4934288402be3464110109a4dae3bd6fb3e93
author David S. Miller <davem@davemloft.net> 1460598543 -0400
committer David S. Miller <davem@davemloft.net> 1460598543 -0400

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>