]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jan 2017 18:25:36 +0000 (10:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jan 2017 18:25:36 +0000 (10:25 -0800)
commit1e3c9f43fcd06c3e380bc128f151bf9793d818fa
tree81a47371ce4aa7d4e93fc2ebb82466d8ab1b5e3e
parent1ed602cbfef4292aac2c0400bad5081d6f92323b
parent68c1d492b3bab1b8beb150ed7925da2914b6086b
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