David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The mptcp conflict was overlapping additions. The SMC conflict was an additional and removal happening at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-02-27 18:31:39 -08:00
..
af_vsock_tap.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
af_vsock.c	vsock: fix potential deadlock in transport->release()	2020-02-27 12:03:56 -08:00
diag.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02:00
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-02-27 18:31:39 -08:00
virtio_transport.c	vsock/virtio: remove loopback handling	2019-12-11 15:01:23 -08:00
vmci_transport_notify_qstate.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02:00
vmci_transport_notify.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02:00
vmci_transport_notify.h	vsock: remove include/linux/vm_sockets.h file	2019-11-14 18:12:17 -08:00
vmci_transport.c	vsock: add VMADDR_CID_LOCAL definition	2019-12-11 15:01:23 -08:00
vmci_transport.h	vsock: handle buffer_size sockopts in the core	2019-11-14 18:12:18 -08:00
vsock_addr.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02:00
vsock_loopback.c	vsock: add vsock_loopback transport	2019-12-11 15:01:23 -08:00