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
..
af_vsock_tap.c
af_vsock.c	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00
diag.c
hyperv_transport.c	vsock: fix potential deadlock in transport->release()	2020-02-27 12:03:56 -08:00
Kconfig	vsock: add vsock_loopback transport	2019-12-11 15:01:23 -08:00
Makefile	vsock: add vsock_loopback transport	2019-12-11 15:01:23 -08:00
virtio_transport_common.c	virtio_vsock: Fix race condition in virtio_transport_recv_pkt	2020-05-30 17:44:01 -07:00
virtio_transport.c	vsock/virtio: annotate 'the_virtio_vsock' RCU pointer	2020-07-15 17:47:15 -07:00
vmci_transport_notify_qstate.c
vmci_transport_notify.c
vmci_transport_notify.h	vsock: remove include/linux/vm_sockets.h file	2019-11-14 18:12:17 -08:00
vmci_transport.c	vsock/vmci: make vmci_vsock_transport_cb() static	2020-06-05 13:18:26 -07:00
vmci_transport.h	vsock: handle buffer_size sockopts in the core	2019-11-14 18:12:18 -08:00
vsock_addr.c
vsock_loopback.c	vsock: add vsock_loopback transport	2019-12-11 15:01:23 -08:00