tree 394bd0d901fcff6001ab77c6cf436915127698eb
parent 8c9dff1ebd721a3b19a002d1a901d4dc31b18ebb
parent c5c08bed843c2b2c048c16d1296d7631d7c1620e
author Linus Torvalds <torvalds@linux-foundation.org> 1545273648 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1545273648 -0800
mergetag object c5c08bed843c2b2c048c16d1296d7631d7c1620e
 type commit
 tag for_linus
 tagger Michael S. Tsirkin <mst@redhat.com> 1545261846 -0500
 
 virtio fix
 
 A last-minute fix for a test build.
 
 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJcGtMtAAoJECgfDbjSjVRpps4H/27UFb1IcPR2AVITTk8BTZA0
 eBPxr7d3JoaVLUXkxi4tju3kJ8dI1bqrfJQkmAfa26esw6q5CDau1G7m34UdUqY3
 kJMJ0Ce+HOdsSVC7a4PlT9UjgaCkIIi2X+uahAigshvJwumBYISnj2dt37SoDlTg
 lIBwWfwNdSkmoEc4bJ9s26xyAnBXRSgz0CQlvhzZthHtorfzkaoL3P1/o7BznHqR
 rMIzge7S3E/hN4sRK15DJ5y/QNVKKSiuy2uFxQuLft3sQdEndM+GUnEMrvqlRvUu
 iSCdquAXkk08Ok7pINkMGcQ3TE5JPl+Q8BPGzK/a8Aiqsty13jcUjReMySvezrI=
 =ik55
 -----END PGP SIGNATURE-----

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/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