From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Jan 2015 21:05:56 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v3.19-rc4~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b11ecb2785b94e931b445fc0ae3e7447e16b2c49;p=~emulex%2Finfiniband.git

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

pull virtio/vhost fixes from Michael Tsirkin:
 "This fixes a couple of bugs triggered by hot-unplug of virtio devices,
  as well as a regression in vhost-net"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost/net: length miscalculation
  virtio_pci: document why we defer kfree
  virtio_pci: defer kfree until release callback
  virtio_pci: device-specific release callback
  virtio: make del_vqs idempotent
---

b11ecb2785b94e931b445fc0ae3e7447e16b2c49