git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 883af14 c707061)
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)
commit49e555a932de57611eb27edf2d1ad03d9a267bdd
tree81a47371ce4aa7d4e93fc2ebb82466d8ab1b5e3etree
parent883af14e67e8b8702b5560aa64c888c0cd0bd66ccommit | diff
parentc7070619f3408d9a0dffbed9149e6f00479cf43bcommit | diff
Merge tag 'for_linus' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.