From: David S. Miller <davem@davemloft.net>
Date: Tue, 21 Apr 2020 18:50:31 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v5.10.7~2729^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76fc6a9a9a6a19213db86362ce0ff8299d7a6b9e;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./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>
---

76fc6a9a9a6a19213db86362ce0ff8299d7a6b9e