]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1547251 d147fb1)
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)
commit771f3f6edf91bab2c847b6269d02555f3140bb76
tree98723a90af1aa9f3e86dcefece3d8e62df0fd8a2tree | snapshot
parent1547251a70c3a610ba2d41762b81fadc289df2facommit | diff
parentd147fb1e5ce3b4fe44858cb681ea1a9664a91b07commit | diff
Merge git://git.kernel.org/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
Linux Kernel Source Tree.