David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-07 16:29:30 -05:00
..
Kconfig	vhost: split out vringh Kconfig	2016-08-02 16:54:28 +03:00
Kconfig.vringh	vhost: split out vringh Kconfig	2016-08-02 16:54:28 +03:00
Makefile	VSOCK: Add Makefile and Kconfig	2016-08-02 02:57:30 +03:00
net.c	vhost_net: tx batching	2017-01-18 16:35:30 -05:00
scsi.c	vhost/scsi: silence uninitialized variable warning	2017-01-19 23:46:30 +02:00
test.c	Merge 4.8-rc5 into char-misc-next	2016-09-05 08:04:07 +02:00
test.h
vhost.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
vhost.h	vhost: cache used event for better performance	2016-12-16 00:12:50 +02:00
vringh.c	vringh: kill off ACCESS_ONCE()	2016-12-16 00:13:36 +02:00
vsock.c	vhost/vsock: handle vhost_vq_init_access() error	2017-01-25 00:33:10 +02:00