David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-01-28 10:33:06 -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 test module

2010-12-09 16:00:21 +02:00

vhost.c

vhost: better detection of available buffers

2017-01-18 16:35:29 -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