Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2018 02:40:48 +0000 (18:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2018 02:40:48 +0000 (18:40 -0800)
commitab63e725b49c80f941446327d79ba5b68593bf5a
tree394bd0d901fcff6001ab77c6cf436915127698eb
parent8c9dff1ebd721a3b19a002d1a901d4dc31b18ebb
parentc5c08bed843c2b2c048c16d1296d7631d7c1620e
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio fix from Michael Tsirkin:
 "A last-minute fix for a test build"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: fix test build after uio.h change