Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Feb 2019 08:05:28 +0000 (08:05 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Feb 2019 08:05:28 +0000 (08:05 +0000)
Pull virtio fixes from Michael Tsirkin:
 "A small fix for a uapi header, and a fix for VDPA for non-x86 guests"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: drop internal struct from UAPI
  virtio: support VIRTIO_F_ORDER_PLATFORM


Trivial merge