diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-02 13:23:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-02 13:23:13 -0700 |
| commit | 4fbb97bac1be4fb5a4b8030e2b247b81504fe694 (patch) | |
| tree | 9e99af325a5daf37bb2e28d1f5eff9a61cd96872 /drivers/mfd/sun6i-prcm.c | |
| parent | db34a4714c013b644eec2de0ec81b1f0373b8b93 (diff) | |
| parent | 34a4c95abd25ab41fb390b985a08a651b1fa0b0f (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) Remove the skb_ext_del from nf_reset, and renames it to a more
fitting nf_reset_ct(). Patch from Florian Westphal.
2) Fix deadlock in nft_connlimit between packet path updates and
the garbage collector.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/mfd/sun6i-prcm.c')
0 files changed, 0 insertions, 0 deletions