| commit | 49e555a932de57611eb27edf2d1ad03d9a267bdd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 25 10:25:36 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 25 10:25:36 2017 -0800 |
| tree | 81a47371ce4aa7d4e93fc2ebb82466d8ab1b5e3e | |
| parent | 883af14e67e8b8702b5560aa64c888c0cd0bd66c [diff] | |
| parent | c7070619f3408d9a0dffbed9149e6f00479cf43b [diff] |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost Pull virtio/vhost fixes from Michael Tsirkin: - ARM DMA fixes - vhost vsock bugfix * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vring: Force use of DMA API for ARM-based systems with legacy devices virtio_mmio: Set DMA masks appropriately vhost/vsock: handle vhost_vq_init_access() error