diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-07 23:05:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-07 23:05:26 -0400 |
| commit | 6e06c0e2347ec79d0bd5702b2438fe883f784545 (patch) | |
| tree | 3f55976275c94822cd406e7edc549f668901affa /drivers/staging | |
| parent | 3a084ddb4bf299a6e898a9a07c89f3917f0713f7 (diff) | |
| parent | c70aa540c7a9f67add11ad3161096fb95233aa2e (diff) | |
| download | blackbird-op-linux-6e06c0e2347ec79d0bd5702b2438fe883f784545.tar.gz blackbird-op-linux-6e06c0e2347ec79d0bd5702b2438fe883f784545.zip | |
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/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 <davem@davemloft.net>
Diffstat (limited to 'drivers/staging')
0 files changed, 0 insertions, 0 deletions
