diff options
| author | David S. Miller <davem@davemloft.net> | 2020-04-21 11:50:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-21 11:50:31 -0700 |
| commit | 76fc6a9a9a6a19213db86362ce0ff8299d7a6b9e (patch) | |
| tree | d286160f6819b468a04f75e29dad5eb140523ca7 /net/rfkill | |
| parent | a460fc5d4c170806a31e590df37ead3ab951315c (diff) | |
| parent | b4faef1739dd1f3b3981b8bf173a2266ea86b1eb (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) flow_block_cb memleak in nf_flow_table_offload_del_cb(), from Roi Dayan.
2) Fix error path handling in nf_nat_inet_register_fn(), from Hillf Danton.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill')
0 files changed, 0 insertions, 0 deletions