diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-10 19:33:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-10 19:33:08 +0200 |
| commit | fd685657cd5441e504113db1928196d030c8c414 (patch) | |
| tree | 947d6d4401a9f34659f8954fcd5e2e8eda1efbb4 /include/rdma/ib_fmr_pool.h | |
| parent | cxgb4: add support to display DCB info (diff) | |
| parent | netfilter: nfnetlink_osf: fix using plain integer as NULL warning (diff) | |
| download | linux-fd685657cd5441e504113db1928196d030c8c414.tar.xz linux-fd685657cd5441e504113db1928196d030c8c414.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following batch contains netfilter updates for your net-next tree:
1) Expose NFT_OSF_MAXGENRELEN maximum OS name length from the new OS
passive fingerprint matching extension, from Fernando Fernandez.
2) Add extension to support for fine grain conntrack timeout policies
from nf_tables. As preparation works, this patchset moves
nf_ct_untimeout() to nf_conntrack_timeout and it also decouples the
timeout policy from the ctnl_timeout object, most work done by
Harsha Sharma.
3) Enable connection tracking when conntrack helper is in place.
4) Missing enumeration in uapi header when splitting original xt_osf
to nfnetlink_osf, also from Fernando.
5) Fix a sparse warning due to incorrect typing in the nf_osf_find(),
from Wei Yongjun.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/rdma/ib_fmr_pool.h')
0 files changed, 0 insertions, 0 deletions