From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 19 Jun 2017 00:25:05 +0000 (+0900)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v4.12-rc6~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3696e4f0b0072eb9753ffa1387be1dd2ebe2cb8f;p=linux.git

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

3696e4f0b0072eb9753ffa1387be1dd2ebe2cb8f