diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-14 13:15:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-14 13:15:02 -0700 |
| commit | 1b54f4fa4dec26a0d3b885176ecc8d6d3ca7fd95 (patch) | |
| tree | a754dc697e0fe208021135d1764587a6cbdf7642 /drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | |
| parent | c9e2053d4b1c634064bd3160689fe4ed52978d31 (diff) | |
| parent | 340eaff651160234bdbce07ef34b92a8e45cd540 (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) Fix gcc-10 compilation warning in nf_conntrack, from Arnd Bergmann.
2) Add NF_FLOW_HW_PENDING to avoid races between stats and deletion
commands, from Paul Blakey.
3) Remove WQ_MEM_RECLAIM from the offload workqueue, from Roi Dayan.
4) Infinite loop when removing nf_conntrack module, from Florian Westphal.
5) Set NF_FLOW_TEARDOWN bit on expiration to avoid races when refreshing
the timeout from the software path.
6) Missing nft_set_elem_expired() check in the rbtree, from Phil Sutter.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c')
0 files changed, 0 insertions, 0 deletions