
This merge resolves conflicts with 75aec9df3a
("bridge: Remove
br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve
netns support in the network stack that reached upstream via David's
net-next tree.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Conflicts:
net/bridge/br_netfilter_hooks.c
Linux DECnet Project ====================== The documentation for this kernel subsystem is available in the Documentation/networking subdirectory of this distribution and also on line at http://www.chygwyn.com/DECnet/ Steve Whitehouse <SteveW@ACM.org>