]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e9d399 7d91fab)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Apr 2020 18:50:31 +0000 (11:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Apr 2020 18:50:31 +0000 (11:50 -0700)
commit70ff2b93fbd270e798748519e0a9c0363d57d18e
treed286160f6819b468a04f75e29dad5eb140523ca7tree | snapshot
parent4e9d399d869388f44e1dd6256c7be3fa291e76abcommit | diff
parent7d91fabee744a59fecd86d3fde83677b01b8ced2commit | 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>
Linux Kernel Source Tree.