From: Jakub Kicinski <kuba@kernel.org>
Date: Tue, 12 Apr 2022 16:48:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
X-Git-Tag: baikal/aarch64/sdk6.1~4221^2~11
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=41f4c8e0ced6b8270ad66345b4ae987ea59162ab;p=kernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

1) Fix cgroupv2 from the input path, from Florian Westphal.

2) Fix incorrect return value of nft_parse_register(), from Antoine Tenart.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: nf_tables: nft_parse_register can return a negative value
  netfilter: nft_socket: make cgroup match work in input too
====================

Link: https://lore.kernel.org/r/20220412094246.448055-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

41f4c8e0ced6b8270ad66345b4ae987ea59162ab