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

Conflicts:
	net/netfilter/nf_tables_core.c

The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.

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

2015-03-23 22:22:43 -04:00

..

Kconfig

vhost: Make vhost a separate module

2013-07-07 17:33:44 +03:00

Makefile

vhost: Make vhost a separate module

2013-07-07 17:33:44 +03:00

net.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-03-03 21:16:48 -05:00

scsi.c

loop/usb/vhost-scsi/xen-scsiback: Fix use of __transport_register_session

2015-03-19 23:15:14 -07:00

test.c

vhost: move memory pointer to VQs

2014-06-09 16:21:07 +03:00

test.h

…

vhost.c

vhost: switch vhost get_indirect() to iov_iter, kill memcpy_fromiovec()

2015-02-04 01:34:15 -05:00

vhost.h

vhost: remove unnecessary forward declarations in vhost.h

2014-12-09 12:06:33 +02:00

vringh.c

vringh: update for virtio 1.0 APIs

2014-12-15 23:49:28 +02:00