From: David S. Miller <davem@davemloft.net>
Date: Sun, 3 Jun 2018 12:24:27 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Tag: 4.18-rc1-smb3-fixes~114^2~77
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=4cb160d0a63bb16718fc25c52fe51fe416a1f09e;p=sfrench%2Fcifs-2.6.git

Merge git://git./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) Get rid of nf_sk_is_transparent(), use inet_sk_transparent() instead.
   From Máté Eckl.

2) Move shared tproxy infrastructure to nf_tproxy_ipv4 and nf_tproxy_ipv6.
   Also from Máté.

3) Add hashtable to speed up chain lookups by name, from Florian Westphal.

4) Patch series to add connlimit support reusing part of the
   nf_conncount infrastructure. This includes preparation changes such
   passing context to the object and expression destroy interface;
   garbage collection for expressions embedded into set elements, and
   the introduction of the clone_destroy interface for expressions.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

4cb160d0a63bb16718fc25c52fe51fe416a1f09e