]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Feb 2017 23:43:30 +0000 (15:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Feb 2017 23:43:30 +0000 (15:43 -0800)
Pull virtio/vhost fixes from Michael S. Tsirkin:
 "Last minute fixes:

   - ARM DMA fix revert

   - vhost endian-ness fix

   - MAINTAINERS: email address change for Amit"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  MAINTAINERS: update email address for Amit Shah
  vhost: fix initialization for vq->is_le
  Revert "vring: Force use of DMA API for ARM-based systems with legacy devices"

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge