projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb359b6 8a3dca6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Wed, 19 Jun 2019 01:43:40 +0000 (21:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jun 2019 01:43:40 +0000 (21:43 -0400)
commitd470e720ef27786d97b18e7cf50230610e4e6b17
tree98723a90af1aa9f3e86dcefece3d8e62df0fd8a2tree | snapshot
parentcb359b60416701c8bed82fec79de25a144beb893commit | diff
parent8a3dca632538c550930ce8bafa8c906b130d35cfcommit | diff
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

1) Module autoload for masquerade and redirection does not work.

2) Leak in unqueued packets in nf_ct_frag6_queue(). Ignore duplicated
   fragments, pretend they are placed into the queue. Patches from
   Guillaume Nault.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/netfilter/nf_conntrack_reasm.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git