Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Jul 2017 13:02:22 +0000 (14:02 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Jul 2017 13:02:22 +0000 (14:02 +0100)
commitc644bd79c0a782045f58d3dffebaf3d3154e32bf
treef9b6920a31e51428d907b4a056c99186332b9f1d
parent3d05035efaac1e9a4583b62cd70ecb8541399c0f
parent91af6ba7ff16bd7e5919aedfe70aad73a3375619
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>
net/netfilter/nf_conntrack_proto_sctp.c