linux/drivers/vhost
David S. Miller 6e0895c2ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	drivers/net/ethernet/intel/igb/igb_main.c
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
	include/net/scm.h
	net/batman-adv/routing.c
	net/ipv4/tcp_input.c

The e{uid,gid} --> {uid,gid} credentials fix conflicted with the
cleanup in net-next to now pass cred structs around.

The be2net driver had a bug fix in 'net' that overlapped with the VLAN
interface changes by Patrick McHardy in net-next.

An IGB conflict existed because in 'net' the build_skb() support was
reverted, and in 'net-next' there was a comment style fix within that
code.

Several batman-adv conflicts were resolved by making sure that all
calls to batadv_is_my_mac() are changed to have a new bat_priv first
argument.

Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO
rewrite in 'net-next', mostly overlapping changes.

Thanks to Stephen Rothwell and Antonio Quartulli for help with several
of these merge resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-22 20:32:51 -04:00
..
Kconfig drivers/vhost: remove depends on CONFIG_EXPERIMENTAL 2013-01-21 14:52:45 -08:00
Kconfig.tcm drivers/vhost: remove depends on CONFIG_EXPERIMENTAL 2013-01-21 14:52:45 -08:00
Makefile tcm_vhost: Initial merge for vhost level target fabric driver 2012-07-29 13:49:10 -07:00
net.c vhost_net: remove tx polling state 2013-04-11 16:16:22 -04:00
tcm_vhost.c tcm_vhost: Send bad target to guest when cmd fails 2013-04-11 01:48:42 -07:00
tcm_vhost.h tcm_vhost: Multi-queue support 2013-02-13 11:30:14 -08:00
test.c vhost: Separate vhost-net features from vhost features 2012-07-22 01:21:53 +03:00
test.h vhost test module 2010-12-09 16:00:21 +02:00
vhost.c vhost_net: remove tx polling state 2013-04-11 16:16:22 -04:00
vhost.h vhost_net: handle polling errors when setting backend 2013-01-29 15:43:03 -05:00