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
..
hci	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
nci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-25 17:49:04 -07:00
af_nfc.c
core.c	net: nfc: kerneldoc fixes	2020-07-13 17:20:40 -07:00
digital_core.c
digital_dep.c
digital_technology.c
digital.h
Kconfig
llcp_commands.c
llcp_core.c
llcp_sock.c	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
llcp.h
Makefile
netlink.c	nfc: add missing attribute validation for vendor subcommand	2020-03-03 13:28:49 -08:00
nfc.h
rawsock.c	net: make ->{get,set}sockopt in proto_ops optional	2020-07-19 18:16:41 -07:00