git.cascardo.eti.br Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

author	Pablo Neira Ayuso <pablo@netfilter.org>
	Sat, 17 Oct 2015 12:11:08 +0000 (14:11 +0200)
committer	Pablo Neira Ayuso <pablo@netfilter.org>
	Sat, 17 Oct 2015 12:28:03 +0000 (14:28 +0200)
commit	f0a0a978b66fea782a52b0a7075b3fa9ab27ad0a
tree	52ecc0eafbac697c6afaa542efe324984484120c	tree \| snapshot
parent	c8d71d08aa23679f56e7072358383442c6ede352	commit \| diff
parent	4be3158abe1e02d24f82b34101e41d662fae2185	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/davem/net-next

This merge resolves conflicts with 75aec9df3a78 ("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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

net/bridge/br_netfilter_hooks.c	diff1 \|	diff2 \|	blob \| history
net/decnet/dn_route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_SYNPROXY.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_defrag_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_SYNPROXY.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_reject_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_log.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history