From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Mar 2015 16:48:47 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=515fb5c317db991e2f9877936b3b21a35c1d3190;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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>
---

515fb5c317db991e2f9877936b3b21a35c1d3190