diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-10 17:48:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-10 17:48:47 +0100 |
| commit | 515fb5c317db991e2f9877936b3b21a35c1d3190 (patch) | |
| tree | 93f05ff9459d6cae977bd468a6ba5a1f59f477ad /drivers/atm/nicstar.c | |
| parent | net: phy: bcm7xxx: add alternate id for 7439 (diff) | |
| parent | netfilter: bridge: use rcu hook to resolve br_netfilter dependency (diff) | |
| download | linux-515fb5c317db991e2f9877936b3b21a35c1d3190.tar.xz linux-515fb5c317db991e2f9877936b3b21a35c1d3190.zip | |
Merge git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'drivers/atm/nicstar.c')
0 files changed, 0 insertions, 0 deletions