diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-23 17:22:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-23 17:22:09 -0700 |
| commit | 8e8135862ccb5082347e2137b8a33edaf51427ce (patch) | |
| tree | 724346550f0f7a744cede0b050f3b5f5e44aa2fa /include | |
| parent | 32818c075c54bb0cae44dd6f7ab00b01c52b8372 (diff) | |
| parent | 8210e344ccb798c672ab237b1a4f241bda08909b (diff) | |
| download | linux-8e8135862ccb5082347e2137b8a33edaf51427ce.tar.gz | |
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>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions