diff options
author | David S. Miller <davem@davemloft.net> | 2019-01-29 02:34:38 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-29 02:34:38 +0100 |
commit | 343917b410ba7250dbbe59a8330feffaf36eaab8 (patch) | |
tree | 075af8a0e35ace954962538556adeb5e96bd1f57 /include/video | |
parent | Merge branch 'qed-Error-recovery-process' (diff) | |
parent | netfilter: ipv4: remove useless export_symbol (diff) | |
download | linux-343917b410ba7250dbbe59a8330feffaf36eaab8.tar.xz linux-343917b410ba7250dbbe59a8330feffaf36eaab8.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains Netfilter/IPVS updates for your net-next tree:
1) Introduce a hashtable to speed up object lookups, from Florian Westphal.
2) Make direct calls to built-in extension, also from Florian.
3) Call helper before confirming the conntrack as it used to be originally,
from Florian.
4) Call request_module() to autoload br_netfilter when physdev is used
to relax the dependency, also from Florian.
5) Allow to insert rules at a given position ID that is internal to the
batch, from Phil Sutter.
6) Several patches to replace conntrack indirections by direct calls,
and to reduce modularization, from Florian. This also includes
several follow up patches to deal with minor fallout from this
rework.
7) Use RCU from conntrack gre helper, from Florian.
8) GRE conntrack module becomes built-in into nf_conntrack, from Florian.
9) Replace nf_ct_invert_tuplepr() by calls to nf_ct_invert_tuple(),
from Florian.
10) Unify sysctl handling at the core of nf_conntrack, from Florian.
11) Provide modparam to register conntrack hooks.
12) Allow to match on the interface kind string, from wenxu.
13) Remove several exported symbols, not required anymore now after
a bit of de-modulatization work has been done, from Florian.
14) Remove built-in map support in the hash extension, this can be
done with the existing userspace infrastructure, from laura.
15) Remove indirection to calculate checksums in IPVS, from Matteo Croce.
16) Use call wrappers for indirection in IPVS, also from Matteo.
17) Remove superfluous __percpu parameter in nft_counter, patch from
Luc Van Oostenryck.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/video')
0 files changed, 0 insertions, 0 deletions