David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
Kconfig	vhost: allow vhost-scsi driver to be built-in	2018-08-22 01:01:32 +03:00
Kconfig.vringh	vhost: split out vringh Kconfig	2016-08-02 16:54:28 +03:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
scsi.c	vhost/scsi: Use common handling code in request queue handler	2018-10-24 21:16:13 -04:00
test.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
test.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
vhost.c	Revert "net: vhost: lock the vqs one by one"	2018-12-12 21:56:20 -08:00
vhost.h	vhost: switch to use new message format	2018-08-06 10:41:04 -07:00
vringh.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
vsock.c	vhost/vsock: fix use-after-free in network stack callers	2018-12-06 14:28:38 -05:00