diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-18 17:56:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-18 17:56:30 -0800 |
| commit | 5cd856a5ef9aa189df757c322be34ad735a5b17f (patch) | |
| tree | 89072d7d973784c8fb131aa72acb12e92bc3164c /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | 1f43f400a2cbb02f3d34de8fe30075c070254816 (diff) | |
| parent | c93a49b9769e435990c82297aa0baa31e1538790 (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:
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 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions