From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Jan 2017 18:25:36 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=49e555a932de57611eb27edf2d1ad03d9a267bdd;p=linux-beck.git

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
---

49e555a932de57611eb27edf2d1ad03d9a267bdd