From: David S. Miller Date: Fri, 22 May 2015 18:25:45 +0000 (-0400) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Tag: v4.1-rc5~7^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=572152adfba711f770fc7ec5d140070a91d8e045;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git Merge git://git./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 --- 572152adfba711f770fc7ec5d140070a91d8e045