Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-11-27 18:25:27 -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
af_vsock.c	Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-19 19:08:46 -08:00
af_vsock_tap.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07: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
virtio_transport.c	vsock/virtio: annotate 'the_virtio_vsock' RCU pointer	2020-07-15 17:47:15 -07:00
virtio_transport_common.c	vsock/virtio: discard packets only when socket is really closed	2020-11-23 16:36:29 -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
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_notify_qstate.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02: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