]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 May 2013 17:13:52 +0000 (10:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 May 2013 17:13:52 +0000 (10:13 -0700)
commit55ade5a8413c8bb51a45bc90c395c6397ff760fe
tree36e247af959104ef4a055a2d9660e48b1eb56283
parente543a0837d37f0dbf95ee856c213784262fd645b
parent2aa5f3acea31e7eb840e976d500787c2d1d829ea
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull more vhost fixes from Michael Tsirkin:
 "This fixes some minor issues in the patches that have been merged.

  We also finally drop the workaround disabling event_idx for scsi: it
  was always questionable, and now we know it's not needed.

  There's also a memory leak fix"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost-scsi: Enable VIRTIO_RING_F_EVENT_IDX
  vhost: drop virtio_net.h dependency
  vhost-net: Cleanup vhost_ubuf and vhost_zcopy
  vhost: Remove vhost_enable_zcopy in vhost.h
  vhost: Remove comments for hdr in vhost.h
  vhost: Move VHOST_NET_FEATURES to net.c
  vhost-net: Free ubuf when vhost_dev_set_owner fails
  vhost: Export vhost_dev_set_owner