| commit | 59717f3931f0009a735b4c44daf37b0e2322e989 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jun 03 13:49:08 2021 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jun 03 13:49:08 2021 -0700 |
| tree | 46f7fe3b7629ddc8db6f4c594d2488459a82b8d4 | |
| parent | ab00f3e051e851a8458f0d0eb1bb426deadb6619 [diff] | |
| parent | 8971ee8b087750a23f3cd4dc55bff2d0303fd267 [diff] |
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>