tree f674c351988d101c686503b9c4af56a2b28fd167
parent 381c759d9916c42959515ad34a6d467e24a88e93
parent faecbb45ebefb20260ad4a631e011e93c896cb73
author David S. Miller <davem@davemloft.net> 1432319145 -0400
committer David S. Miller <davem@davemloft.net> 1432319145 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contain Netfilter fixes for your net tree, they are:

1) Fix a race in nfnetlink_log and nfnetlink_queue that can lead to a crash.
   This problem is due to wrong order in the per-net registration and netlink
   socket events. Patch from Francesco Ruggeri.

2) Make sure that counters that userspace pass us are higher than 0 in all the
   x_tables frontends. Discovered via Trinity, patch from Dave Jones.

3) Revert a patch for br_netfilter to rely on the conntrack status bits. This
   breaks stateless IPv6 NAT transformations. Patch from Florian Westphal.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>