From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Dec 2018 02:40:48 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ab63e725b49c80f941446327d79ba5b68593bf5a;p=openwrt%2Fstaging%2Fblogic.git

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
---

ab63e725b49c80f941446327d79ba5b68593bf5a