diff options
| author | David S. Miller <[email protected]> | 2021-02-09 23:55:59 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-02-09 23:55:59 +0000 |
| commit | 450bbc3395185963b133177a9ddae305dae7c5fa (patch) | |
| tree | 6a7f648b967531b188336fb8bc0be1af3e4f3034 /tools/perf/util/annotate.c | |
| parent | vsock: fix locking in vsock_shutdown() (diff) | |
| parent | netfilter: nftables: relax check for stateful expressions in set definition (diff) | |
| download | kernel-450bbc3395185963b133177a9ddae305dae7c5fa.tar.gz kernel-450bbc3395185963b133177a9ddae305dae7c5fa.zip | |
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 <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions