]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2021 22:32:54 +0000 (15:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2021 22:32:54 +0000 (15:32 -0700)
commit9250a6f720c9a081d895de28e702baaa4a3a9392
tree0cf911953df3ca12f637f87ee7abcc8c01f8afb1
parent3fa78c540913c37f06ee1b8c62f5784f9f04473f
parente5b5661be4dadd660d8fc07eb1c9fe8b3fe9faf0
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>