projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f43f40 c93a49b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Feb 2019 01:56:30 +0000 (17:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Feb 2019 01:56:30 +0000 (17:56 -0800)
commit5cd856a5ef9aa189df757c322be34ad735a5b17f
tree89072d7d973784c8fb131aa72acb12e92bc3164ctree | snapshot
parent1f43f400a2cbb02f3d34de8fe30075c070254816commit | diff
parentc93a49b9769e435990c82297aa0baa31e1538790commit | 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) 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>
Linux 6.x block layer and io_uring tree(s)