From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Oct 2015 02:26:17 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v4.3~11^2~42
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=36a28b21169d28db2a3409a4e2d4b9a7563c1a00;p=linux-2.6-block.git

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

Pablo Neira Ayuso says:

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

The following patchset contains four Netfilter fixes for net, they are:

1) Fix Kconfig dependencies of new nf_dup_ipv4 and nf_dup_ipv6.

2) Remove bogus test nh_scope in IPv4 rpfilter match that is breaking
   --accept-local, from Xin Long.

3) Wait for RCU grace period after dropping the pending packets in the
   nfqueue, from Florian Westphal.

4) Fix sleeping allocation while holding spin_lock_bh, from Nikolay Borisov.
====================

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

36a28b21169d28db2a3409a4e2d4b9a7563c1a00