David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
Kconfig	tap: tap as an independent module	2017-02-11 20:59:41 -05: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	vhost_net: use packet weight for rx handler, too	2018-04-24 10:02:13 -04:00
scsi.c	vhost: remove unused lock check flag in vhost_dev_cleanup()	2018-02-01 16:26:44 +02:00
test.c	vhost: remove unused lock check flag in vhost_dev_cleanup()	2018-02-01 16:26:44 +02: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	vhost: synchronize IOTLB message with dev cleanup	2018-05-24 22:09:51 -04:00
vhost.h	vhost: return bool from *_access_ok() functions	2018-04-11 10:54:06 -04:00
vringh.c	vringh: kill off ACCESS_ONCE()	2016-12-16 00:13:36 +02:00
vsock.c	fw_cfg, vhost: features fixes	2018-04-06 19:21:41 -07:00