| commit | a4ec80082c82f3fda775d13b2a72aac38248ced6 | [log] [tgz] |
|---|---|---|
| author | Pablo Neira Ayuso <pablo@netfilter.org> | Mon Dec 14 20:29:00 2015 +0100 |
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | Mon Dec 14 20:31:16 2015 +0100 |
| tree | 23affbe49c629cbbdb5553ca78aa444a7ccf2ead | |
| parent | 19576c9478682a398276c994ea0d2696474df32b [diff] | |
| parent | cb4396edd84ed73081635fb933d19c1410fafaf4 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/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