]> 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>
Sun, 10 Mar 2019 19:47:57 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Mar 2019 19:47:57 +0000 (12:47 -0700)
commit360603a922b66b982f46ff7838ec41ddd02793a8
treedddb4253b06a58609407ced51aaaf475f724baae
parent7cea0d2ce5ac027614be709184f8aea6db177cbc
parent833d0e835ca73688400f0bfd13a53222925cd4ed
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin:
 "Several fixes, most notably fix for virtio on swiotlb systems"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: silence an unused-variable warning
  virtio: hint if callbacks surprisingly might sleep
  virtio-ccw: wire up ->bus_name callback
  s390/virtio: handle find on invalid queue gracefully
  virtio-ccw: diag 500 may return a negative cookie
  virtio_balloon: remove the unnecessary 0-initialization
  virtio-balloon: improve update_balloon_size_func
  virtio-blk: Consider virtio_max_dma_size() for maximum segment size
  virtio: Introduce virtio_max_dma_size()
  dma: Introduce dma_max_mapping_size()
  swiotlb: Add is_swiotlb_active() function
  swiotlb: Introduce swiotlb_max_mapping_size()
Documentation/DMA-API.txt
include/linux/dma-mapping.h
include/linux/swiotlb.h
kernel/dma/direct.c
kernel/dma/mapping.c
kernel/dma/swiotlb.c