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
af_vsock.c	vsock: fix potential deadlock in transport->release()	2020-02-27 12:03:56 -08:00
diag.c
hyperv_transport.c	vsock: fix potential deadlock in transport->release()	2020-02-27 12:03:56 -08:00
Kconfig
Makefile
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
vmci_transport_notify_qstate.c
vmci_transport_notify.c
vmci_transport_notify.h
vmci_transport.c
vmci_transport.h
vsock_addr.c
vsock_loopback.c