diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-07-06 14:02:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-06 14:02:22 +0100 |
| commit | c644bd79c0a782045f58d3dffebaf3d3154e32bf (patch) | |
| tree | f9b6920a31e51428d907b4a056c99186332b9f1d /include/linux | |
| parent | ptp: dte: Use LL suffix for 64-bit constants (diff) | |
| parent | netfilter: ebt_nflog: fix unexpected truncated packet (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 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>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions