kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-10 20:48:12 +00:00
Code Issues Releases Packages Activity

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

Browse source 
Resolve conflict between commit 264640fc2c ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b87 ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Conflicts:
	net/ipv6/netfilter/nf_conntrack_reasm.c
This commit is contained in:
Pablo Neira Ayuso 2015-12-14 20:29:00 +01:00
commit a4ec80082c
2322 changed files with 578661 additions and 559130 deletions
Download patch file Download diff file Expand all files Collapse all files