From: David S. Miller <davem@davemloft.net>
Date: Thu, 6 Jul 2017 13:02:22 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v4.14-rc1~533^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c644bd79c0a782045f58d3dffebaf3d3154e32bf;p=platform%2Fkernel%2Flinux-rpi3.git

Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two Netfilter fixes for your net tree,
they are:

1) Fix memleak from netns release path of conntrack protocol trackers,
   patch from Liping Zhang.

2) Uninitialized flags field in ebt_log, that results in unpredictable
   logging format in ebtables, also from Liping.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

c644bd79c0a782045f58d3dffebaf3d3154e32bf