diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-10 00:52:05 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-10 00:52:05 +0300 |
| commit | d0acc7dfd90eb97e90ccd42a567034017ec60fb8 (patch) | |
| tree | 38650e8e367943cdb1dda7edf3e7a857947aac7f /include/linux/fscrypto.h | |
| parent | daf6b9b68fca57effe3fcf74a8528f17516c420f (diff) | |
| parent | 5e59d9a1aed26abcc79abe78af5cfd34e53cbe7f (diff) | |
| download | linux-d0acc7dfd90eb97e90ccd42a567034017ec60fb8.tar.xz | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include/linux/fscrypto.h')
0 files changed, 0 insertions, 0 deletions