]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 56a46f4 0c2277a)
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)
commit17699fcf43a24884fee7a9336c982fa66d6da03f
tree23affbe49c629cbbdb5553ca78aa444a7ccf2eadtree | snapshot
parent56a46f44c0161b09193647370d2d30a061ecc965commit | diff
parent0c2277a70806d3ed20123fc75111534fba8fa6dccommit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflict between commit 4e57c165e13137 ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 522794cdb3e6d ("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
Linux Kernel Source Tree.