projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 19576c9 cb4396e)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 14 Dec 2015 19:29:00 +0000 (20:29 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 14 Dec 2015 19:31:16 +0000 (20:31 +0100)
commita4ec80082c82f3fda775d13b2a72aac38248ced6
tree23affbe49c629cbbdb5553ca78aa444a7ccf2eadtree | snapshot (tar.gz zip)
parent19576c9478682a398276c994ea0d2696474df32bcommit | diff
parentcb4396edd84ed73081635fb933d19c1410fafaf4commit | diff
Merge branch 'master' of git://git./linux/kernel/git/davem/net-next

Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b8701c ("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
net/ipv6/netfilter/nf_conntrack_reasm.c diff1 | diff2 | blob | history
net/netfilter/nft_meta.c diff1 | diff2 | blob | history