From: Jakub Kicinski Date: Wed, 13 Jan 2021 04:25:29 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Tag: microblaze-v5.13~391^2~16 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=c8a8ead01736419a14c3106e1f26a79d74fc84c7;p=linux-2.6-microblaze.git Merge git://git./pub/scm/linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== Netfilter fixes for net 1) Pass conntrack -f to specify family in netfilter conntrack helper selftests, from Chen Yi. 2) Honor hashsize modparam from nf_conntrack_buckets sysctl, from Jesper D. Brouer. 3) Fix memleak in nf_nat_init() error path, from Dinghao Liu. * git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf: netfilter: nf_nat: Fix memleak in nf_nat_init netfilter: conntrack: fix reading nf_conntrack_buckets selftests: netfilter: Pass family parameter "-f" to conntrack tool ==================== Link: https://lore.kernel.org/r/20210112222033.9732-1-pablo@netfilter.org Signed-off-by: Jakub Kicinski --- c8a8ead01736419a14c3106e1f26a79d74fc84c7