diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-28 00:32:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-28 00:32:54 +0200 |
| commit | 0711459095bc9ddb5a0086146d2751e6d5412cbf (patch) | |
| tree | 0cf911953df3ca12f637f87ee7abcc8c01f8afb1 /net/smc/smc_close.c | |
| parent | net: fix a concurrency bug in l2tp_tunnel_register() (diff) | |
| parent | netfilter: nft_socket: fix build with CONFIG_SOCK_CGROUP_DATA=n (diff) | |
| download | linux-0711459095bc9ddb5a0086146d2751e6d5412cbf.tar.xz linux-0711459095bc9ddb5a0086146d2751e6d5412cbf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for net-next:
1) Add support for the catch-all set element. This special element
can be used to define a default action to be applied in case that
the set lookup returns no matching element.
2) Fix incorrect #ifdef dependencies in the nftables cgroupsv2
support, from Arnd Bergmann.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_close.c')
0 files changed, 0 insertions, 0 deletions