[PULL net-2.6] vhost: cleanups and fixes

["Michael S. Tsirkin" <mst@redhat.com>]

The following tree has fixes for vhost-net for 2.6.39.
These are easier to apply on top of Jason's and Krishna's
cleanups, and they got tested this way, so I thought it's
better for everyone to include that, and the trivial
copy_from_user optimization.

But if you think it's too late for that, pls let me know
and I'll try to untangle that dependency.

Thanks!

The following changes since commit 1fc050a13473348f5c439de2bb41c8e92dba5588:

  ipv4: Cache source address in nexthop entries. (2011-03-07 20:54:48 -0800)

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

Jason Wang (3):
      vhost-net: check the support of mergeable buffer outside the receive loop
      vhost-net: Unify the code of mergeable and big buffer handling
      vhost: lock receive queue, not the socket

Krishna Kumar (1):
      vhost: Cleanup vhost.c and net.c

Michael S. Tsirkin (2):
      vhost: copy_from_user -> __copy_from_user
      vhost-net: remove unlocked use of receive_queue

 drivers/vhost/net.c   |  159 ++++++++-----------------------------------------
 drivers/vhost/vhost.c |   55 ++++++++++++-----
 2 files changed, 64 insertions(+), 150 deletions(-)