]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fbb144d ed23ee4)
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)
commit332843506f24bd98140d06de5badd02f718672b2
tree81a47371ce4aa7d4e93fc2ebb82466d8ab1b5e3etree | snapshot
parentfbb144df1faab7816033a1ad37e3f8d15a5a613acommit | diff
parented23ee4a0ffb5c51ce77cbf395c6344ed78d9e70commit | 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
Linux Kernel Source Tree.