]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf3130b 810bfa3)
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)
commitba304a778a643182e4f84a7fd267275479c15be9
tree89072d7d973784c8fb131aa72acb12e92bc3164ctree | snapshot
parentbf3130bb9cad45d64fb6ee53aa891b2fbd6192b1commit | diff
parent810bfa3b9445cc6966d8415b5b7a71bb10773b2acommit | diff
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:
   0e46de870636 ("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 Kernel Source Tree.