diff options
author | David S. Miller <davem@davemloft.net> | 2021-07-23 17:46:05 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-07-23 17:46:05 +0100 |
commit | 200bd5668c04d35510d152aa2f74c659f705a5b3 (patch) | |
tree | 439b892f99b7d81ab0d209206450ce896d3b95d9 /net/qrtr/qrtr.c | |
parent | 9986066d94c971edf19464ed7bf5b26a91520e97 (diff) | |
parent | 217e26bd87b2930856726b48a4e71c768b8c9bf5 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayusosays:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Memleak in commit audit error path, from Dongliang Mu.
2) Avoid possible false sharing for flowtable timeout updates
and nft_last use.
3) Adjust conntrack timestamp due to garbage collection delay,
from Florian Westphal.
4) Fix nft_nat without layer 3 address for the inet family.
5) Fix compilation warning in nfnl_hook when ingress support
is disabled, from Arnd Bergmann.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/qrtr/qrtr.c')
0 files changed, 0 insertions, 0 deletions