David S. Miller a57066b1a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The UDP reuseport conflict was a little bit tricky. The net-next code, via bpf-next, extracted the reuseport handling into a helper so that the BPF sk lookup code could invoke it. At the same time, the logic for reuseport handling of unconnected sockets changed via commit efc6b6f6c3 which changed the logic to carry on the reuseport result into the rest of the lookup loop if we do not return immediately. This requires moving the reuseport_has_conns() logic into the callers. While we are here, get rid of inline directives as they do not belong in foo.c files. The other changes were cases of more straightforward overlapping modifications. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-25 17:49:04 -07:00
..
chtls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
chcr_algo.c	Crypto/chcr: Checking cra_refcnt before unregistering the algorithms	2020-06-10 17:05:02 -07:00
chcr_algo.h	crypto/chtls:Fix compile error when CONFIG_IPV6 is disabled	2020-06-04 16:02:29 -07:00
chcr_common.h	chcr: Handle first or middle part of record	2020-03-08 21:16:23 -07:00
chcr_core.c	cxgb4/chcr: Enable ktls settings at run time	2020-06-01 15:48:18 -07:00
chcr_core.h	cxgb4/chcr: Enable ktls settings at run time	2020-06-01 15:48:18 -07:00
chcr_crypto.h	crypto: Replace zero-length array with flexible-array	2020-06-15 23:08:31 -05:00
chcr_ipsec.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-06-03 16:27:18 -07:00
chcr_ktls.c	crypto/chcr: IPV6 code needs to be in CONFIG_IPV6	2020-06-01 15:49:00 -07:00
chcr_ktls.h	cxgb4/chcr: Enable ktls settings at run time	2020-06-01 15:48:18 -07:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	cxgb4/chcr : Register to tls add and del callback	2020-03-08 21:16:23 -07:00