From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jan 2019 02:54:45 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: for-linus-20190104~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d548e65904ae43b0637d200a2441fc94e0589c30;p=linux-2.6-block.git

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

Pull virtio/vhost updates from Michael Tsirkin:
"Features, fixes, cleanups:

   - discard in virtio blk

   - misc fixes and cleanups"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: correct the related warning message
  vhost: split structs into a separate header file
  virtio: remove deprecated VIRTIO_PCI_CONFIG()
  vhost/vsock: switch to a mutex for vhost_vsock_hash
  virtio_blk: add discard and write zeroes support
---

d548e65904ae43b0637d200a2441fc94e0589c30