Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Sep 2016 21:52:05 +0000 (14:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Sep 2016 21:52:05 +0000 (14:52 -0700)
commitd0acc7dfd90eb97e90ccd42a567034017ec60fb8
tree38650e8e367943cdb1dda7edf3e7a857947aac7f
parentdaf6b9b68fca57effe3fcf74a8528f17516c420f
parent5e59d9a1aed26abcc79abe78af5cfd34e53cbe7f
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "This includes a couple of bugfixs for virtio.

  The virtio console patch is actually also in x86/tip targeting 4.9
  because it helps vmap stacks, but it also fixes IOMMU_PLATFORM which
  was added in 4.8, and it seems important not to ship that in a broken
  configuration"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_console: Stop doing DMA on the stack
  virtio: mark vring_dma_dev() static