David S. Miller 2f184393e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-10-20 10:43:00 -07: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 a lockdep warning in __vsock_release()	2019-10-01 21:23:35 -04:00
diag.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02:00
hyperv_transport.c	hv_sock: use HV_HYP_PAGE_SIZE for Hyper-V communication	2019-10-15 17:25:17 -07:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
virtio_transport_common.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-10-20 10:43:00 -07:00
virtio_transport.c	vsock/virtio: limit the memory used per-socket	2019-07-30 15:00:00 -07: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	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02:00
vmci_transport.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 321	2019-06-05 17:37:05 +02:00
vmci_transport.h	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