From: David S. Miller Date: Tue, 8 May 2012 03:05:13 +0000 (-0400) Subject: Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst... X-Git-Tag: v3.5-rc1~109^2~146 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6e06c0e2347ec79d0bd5702b2438fe883f784545 Merge branch 'vhost-net-next' of git://git./linux/kernel/git/mst/vhost Michael S. Tsirkin says: -------------------- There are mostly bugfixes here. I hope to merge some more patches by 3.5, in particular vlan support fixes are waiting for Eric's ack, and a version of tracepoint patch might be ready in time, but let's merge what's ready so it's testable. This includes a ton of zerocopy fixes by Jason - good stuff but too intrusive for 3.4 and zerocopy is experimental anyway. virtio supported delayed interrupt for a while now so adding support to the virtio tool made sense -------------------- Signed-off-by: David S. Miller --- 6e06c0e2347ec79d0bd5702b2438fe883f784545