diff options
author | 2021-06-03 13:49:08 -0700 | |
---|---|---|
committer | 2021-06-03 13:49:08 -0700 | |
commit | 59717f3931f0009a735b4c44daf37b0e2322e989 (patch) | |
tree | 46f7fe3b7629ddc8db6f4c594d2488459a82b8d4 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | net: stmmac: fix issue where clk is being unprepared twice (diff) | |
parent | netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches (diff) | |
download | linux-dev-59717f3931f0009a735b4c44daf37b0e2322e989.tar.xz linux-dev-59717f3931f0009a735b4c44daf37b0e2322e989.zip |
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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions