From: David S. Miller <davem@davemloft.net>
Date: Thu, 3 Jun 2021 20:49:08 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v5.13-rc5~9^2~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59717f3931f0009a735b4c44daf37b0e2322e989;p=users%2Fdwmw2%2Flinux.git

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) Do not allow to add conntrack helper extension for confirmed
   conntracks in the nf_tables ct expectation support.

2) Fix bogus EBUSY in nfnetlink_cthelper when NFCTH_PRIV_DATA_LEN
   is passed on userspace helper updates.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

59717f3931f0009a735b4c44daf37b0e2322e989