CommitterDavid S. Miller (1)
AuthorDavid S. Miller (1)
Branchesmaster (1)


Linux/linux 5cd856a — net/netfilter nf_tables_api.c, net/netfilter/ipvs ip_vs_ctl.c

by David S. Miller on ⎇
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) Follow up patch to fix a compilation warning in a recent IPVS fix:
   098e13f5b21d ("ipvs: fix dependency on nf_defrag_ipv6").

2) Bogus ENOENT error on flush after rule deletion in the same batch,
   reported by Phil Sutter.
====================

Signed-off-by: David S. Miller <davem at davemloft.net>
DeltaFile
+2-1net/netfilter/ipvs/ip_vs_ctl.c
+3-0net/netfilter/nf_tables_api.c
+5-12 files

UnifiedSplitRaw