diff options
| author | David S. Miller <davem@davemloft.net> | 2021-02-09 15:55:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-09 15:55:59 -0800 |
| commit | 450bbc3395185963b133177a9ddae305dae7c5fa (patch) | |
| tree | 6a7f648b967531b188336fb8bc0be1af3e4f3034 /tools/perf/scripts/python/stat-cpi.py | |
| parent | 1c5fae9c9a092574398a17facc31c533791ef232 (diff) | |
| parent | 664899e85c1312e51d2761e7f8b2f25d053e8489 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) nf_conntrack_tuple_taken() needs to recheck zone for
NAT clash resolution, from Florian Westphal.
2) Restore support for stateful expressions when set definition
specifies no stateful expressions.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/stat-cpi.py')
0 files changed, 0 insertions, 0 deletions