David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -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
af_vsock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
virtio_transport.c	vsock/virtio: limit the memory used per-socket	2019-07-30 15:00:00 -07:00
virtio_transport_common.c	vsock/virtio: change the maximum packet size allowed	2019-07-30 15:00:00 -07: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
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_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