Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Jun 2017 00:25:05 +0000 (09:25 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Jun 2017 00:25:05 +0000 (09:25 +0900)
commit3696e4f0b0072eb9753ffa1387be1dd2ebe2cb8f
treeeedd00376002895af5392c3a2b641d51101b413b
parent7d62d947605640b403fcb75d7928241d34231b4a
parente41b1355508debe45fda33ef8c03ff3ba5d206b9
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio bugfix from Michael Tsirkin:
 "It turns out balloon does not handle IOMMUs correctly. We should fix
  that at some point, for now let's just disable this configuration"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_balloon: disable VIOMMU support