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
Kconfig.vringh	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile
net.c	virtio, vhost: fixes, features, performance	2019-07-17 11:26:09 -07:00
scsi.c	vhost: scsi: add weight support	2019-05-27 11:08:23 -04:00
test.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 482	2019-06-19 17:09:52 +02:00
test.h
vhost.c	virtio, vhost: fixes, features, performance	2019-07-17 11:26:09 -07:00
vhost.h	vhost: disable metadata prefetch optimization	2019-07-26 07:49:29 -04:00
vringh.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
vsock.c	vhost/vsock: split packets to send using multiple buffers	2019-07-30 15:00:00 -07:00