linux/drivers/vhost
David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-02-05 14:33:28 -08: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-02-05 14:33:28 -08:00
scsi.c vhost: vhost_scsi_handle_vq() should just use copy_from_user() 2015-02-04 01:34:16 -05:00
test.c vhost: move memory pointer to VQs 2014-06-09 16:21:07 +03:00
test.h vhost test module 2010-12-09 16:00:21 +02:00
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