Linux Virtualization - Jul 2010 - [GIT PULL net-2.6] vhost-net: more error handling fixes

David,
The following tree includes more fixes dealing with
error handling in vhost-net. It is on top of net-2.6.
Please merge it for 2.6.35.
Thanks!

The following changes since commit 38000a94a902e94ca8b5498f7871c6316de8957a:

  sky2: enable rx/tx in sky2_phy_reinit() (2010-06-23 14:37:04 -0700)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net

Michael S. Tsirkin (2):
      vhost: break out of polling loop on error
      vhost: add unlikely annotations to error path

 drivers/vhost/net.c   |   12 ++++++-
 drivers/vhost/vhost.c |   86 +++++++++++++++++++++++++------------------------
 drivers/vhost/vhost.h |    8 ++--
 3 files changed, 58 insertions(+), 48 deletions(-)
-- 
MST

From: "Michael S. Tsirkin" <mst at redhat.com>
Date: Thu, 1 Jul 2010 19:41:27 +0300
> David,
> The following tree includes more fixes dealing with
> error handling in vhost-net. It is on top of net-2.6.
> Please merge it for 2.6.35.
> Thanks!
> 
> The following changes since commit
38000a94a902e94ca8b5498f7871c6316de8957a:
> 
>   sky2: enable rx/tx in sky2_phy_reinit() (2010-06-23 14:37:04 -0700)
> 
> are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net
> 
> Michael S. Tsirkin (2):
>       vhost: break out of polling loop on error
>       vhost: add unlikely annotations to error path
Pulled.

David,
The following tree includes the current vhost-net patchset.
Please merge it for 2.6.36.
Thanks!

The following changes since commit 4cfa580e7eebb8694b875d2caff3b989ada2efac:

  r6040: Fix args to phy_mii_ioctl(). (2010-07-21 21:10:49 -0700)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next

David Stevens (1):
      vhost-net: mergeable buffers support

Michael S. Tsirkin (1):
      vhost: apply cgroup to vhost workers

Sridhar Samudrala (1):
      cgroups: Add an API to attach a task to current task's cgroup

Tejun Heo (1):
      vhost: replace vhost_workqueue with per-vhost kthread

 drivers/vhost/net.c    |  293 +++++++++++++++++++++++++++++++++++++++++-------
 drivers/vhost/vhost.c  |  228 ++++++++++++++++++++++++++++++++-----
 drivers/vhost/vhost.h  |   55 ++++++---
 include/linux/cgroup.h |    7 +
 kernel/cgroup.c        |   23 ++++
 5 files changed, 515 insertions(+), 91 deletions(-)

From: "Michael S. Tsirkin" <mst at redhat.com>
Date: Wed, 28 Jul 2010 16:32:31 +0300
> The following changes since commit
4cfa580e7eebb8694b875d2caff3b989ada2efac:
> 
>   r6040: Fix args to phy_mii_ioctl(). (2010-07-21 21:10:49 -0700)
> 
> are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
vhost-net-next
> 
Pulled, thanks Michael.