projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 32818c0 8210e34)
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)
commit8e8135862ccb5082347e2137b8a33edaf51427ce
tree724346550f0f7a744cede0b050f3b5f5e44aa2fatree | snapshot
parent32818c075c54bb0cae44dd6f7ab00b01c52b8372commit | diff
parent8210e344ccb798c672ab237b1a4f241bda08909bcommit | diff
Merge git://git./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>
Domain: System / Kernel;