diff options
author | David S. Miller <davem@davemloft.net> | 2019-02-19 02:56:30 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-19 02:56:30 +0100 |
commit | 5cd856a5ef9aa189df757c322be34ad735a5b17f (patch) | |
tree | 89072d7d973784c8fb131aa72acb12e92bc3164c /drivers/reset/sti | |
parent | net: netcp: Fix ethss driver probe issue (diff) | |
parent | ipvs: fix warning on unused variable (diff) | |
download | linux-5cd856a5ef9aa189df757c322be34ad735a5b17f.tar.xz linux-5cd856a5ef9aa189df757c322be34ad735a5b17f.zip |
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@davemloft.net>
Diffstat (limited to 'drivers/reset/sti')
0 files changed, 0 insertions, 0 deletions