summaryrefslogtreecommitdiffstats
path: root/fs/minix
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-02-10 00:55:59 +0100
committerDavid S. Miller <davem@davemloft.net>2021-02-10 00:55:59 +0100
commit450bbc3395185963b133177a9ddae305dae7c5fa (patch)
tree6a7f648b967531b188336fb8bc0be1af3e4f3034 /fs/minix
parentvsock: fix locking in vsock_shutdown() (diff)
parentnetfilter: nftables: relax check for stateful expressions in set definition (diff)
downloadlinux-450bbc3395185963b133177a9ddae305dae7c5fa.tar.xz
linux-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 <davem@davemloft.net>
Diffstat (limited to 'fs/minix')
0 files changed, 0 insertions, 0 deletions