diff options
author | David S. Miller <davem@davemloft.net> | 2018-08-05 16:25:22 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-08-05 16:25:22 -0700 |
commit | 074fb8801667add0b63083af90a3af6edca9532c (patch) | |
tree | 44244193ce484025e6dfb6eaef43342f93d73f3f /scripts/pnmtologo.c | |
parent | c1c8626fcebed467184ffd8de0ab5c9f9d9c3594 (diff) | |
parent | 483f3fdcc70b3c3a1f314235ab0066f3dbd4cfbe (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for your net-next tree:
1) Support for transparent proxying for nf_tables, from Mate Eckl.
2) Patchset to add OS passive fingerprint recognition for nf_tables,
from Fernando Fernandez. This takes common code from xt_osf and
place it into the new nfnetlink_osf module for codebase sharing.
3) Lightweight tunneling support for nf_tables.
4) meta and lookup are likely going to be used in rulesets, make them
direct calls. From Florian Westphal.
A bunch of incremental updates:
5) use PTR_ERR_OR_ZERO() from nft_numgen, from YueHaibing.
6) Use kvmalloc_array() to allocate hashtables, from Li RongQing.
7) Explicit dependencies between nfnetlink_cttimeout and conntrack
timeout extensions, from Harsha Sharma.
8) Simplify NLM_F_CREATE handling in nf_tables.
9) Removed unused variable in the get element command, from
YueHaibing.
10) Expose bridge hook priorities through uapi, from Mate Eckl.
And a few fixes for previous Netfilter batch for net-next:
11) Use per-netns mutex from flowtable event, from Florian Westphal.
12) Remove explicit dependency on iptables CT target from conntrack
zones, from Florian.
13) Fix use-after-free in rmmod nf_conntrack path, also from Florian.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts/pnmtologo.c')
0 files changed, 0 insertions, 0 deletions