Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 16:48:47 +0000 (12:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 16:48:47 +0000 (12:48 -0400)
commit515fb5c317db991e2f9877936b3b21a35c1d3190
tree93f05ff9459d6cae977bd468a6ba5a1f59f477ad
parent59e33c2b021322db92ca27c4d9958e57630443b6
parent1a4ba64d16a42c1b31d52b671accd7f9103e2626
Merge git://git./linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter fixes for net-next

The following batch contains a couple of fixes to address some fallout
from the previous pull request, they are:

1) Address link problems in the bridge code after e5de75b. Fix it by
   using rcu hook to address to avoid ifdef pollution and hard
   dependency between bridge and br_netfilter.

2) Address sparse warnings in the netfilter reject code, patch from
   Florian Westphal.
====================

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