From: Linus Torvalds Date: Fri, 9 Sep 2016 21:52:05 +0000 (-0700) Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d0acc7dfd90eb97e90ccd42a567034017ec60fb8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- d0acc7dfd90eb97e90ccd42a567034017ec60fb8