From: David S. Miller <davem@davemloft.net>
Date: Tue, 27 Apr 2021 22:32:54 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Tag: v5.13-rc1~94^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0711459095bc9ddb5a0086146d2751e6d5412cbf;p=tomoyo%2Ftomoyo-test1.git

Merge git://git./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>
---

0711459095bc9ddb5a0086146d2751e6d5412cbf