]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d884969 0983ca2)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Jul 2020 00:22:09 +0000 (17:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jul 2020 00:22:09 +0000 (17:22 -0700)
commitcf35da735ededbeec6d5c9b440e77475019289fc
tree724346550f0f7a744cede0b050f3b5f5e44aa2fatree | snapshot
parentd884969648c1b4f0b60d72de4ca72e045c44506dcommit | diff
parent0983ca2a5d156f81fa7d2c79b3ae742ae2ae9111commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter/IPVS fixes for net

The following patchset contains Netfilter/IPVS fixes for net:

1) Fix NAT hook deletion when table is dormant, from Florian Westphal.

2) Fix IPVS sync stalls, from guodeqing.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.