Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1a343a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio/vhost fixes from Michael Tsirkin:
 "Bugfixes and documentation fixes.

  Igor's patch that allows users to tweak memory table size is
  borderline, but it does fix known crashes, so I merged it"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: add max_mem_regions module parameter
  vhost: extend memory regions allocation to vmalloc
  9p/trans_virtio: reset virtio device on remove
  virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio
  MAINTAINERS: separate section for s390 virtio drivers
  virtio: define virtio_pci_cfg_cap in header.
  virtio: Fix typecast of pointer in vring_init()
  virtio scsi: fix unused variable warning
  vhost: use binary search instead of linear in find_region()
  virtio_net: document VIRTIO_NET_CTRL_GUEST_OFFLOADS
parents b681268c c9ce42f7

MAINTAINERS

+9 −1
Original line number Original line Diff line number Diff line
@@ -5899,7 +5899,6 @@ S: Supported 
F:	Documentation/s390/kvm.txt

F:	Documentation/s390/kvm.txt

F:	arch/s390/include/asm/kvm*

F:	arch/s390/include/asm/kvm*

F:	arch/s390/kvm/

F:	arch/s390/kvm/

F:	drivers/s390/kvm/





KERNEL VIRTUAL MACHINE (KVM) FOR ARM

KERNEL VIRTUAL MACHINE (KVM) FOR ARM

M:	Christoffer Dall <christoffer.dall@linaro.org>

M:	Christoffer Dall <christoffer.dall@linaro.org>
@@ -10896,6 +10895,15 @@ F: drivers/block/virtio_blk.c 
F:	include/linux/virtio_*.h

F:	include/linux/virtio_*.h

F:	include/uapi/linux/virtio_*.h

F:	include/uapi/linux/virtio_*.h





VIRTIO DRIVERS FOR S390

M:	Christian Borntraeger <borntraeger@de.ibm.com>

M:	Cornelia Huck <cornelia.huck@de.ibm.com>

L:	linux-s390@vger.kernel.org

L:	virtualization@lists.linux-foundation.org

L:	kvm@vger.kernel.org

S:	Supported

F:	drivers/s390/virtio/



VIRTIO GPU DRIVER

VIRTIO GPU DRIVER

M:	David Airlie <airlied@linux.ie>

M:	David Airlie <airlied@linux.ie>

M:	Gerd Hoffmann <kraxel@redhat.com>

M:	Gerd Hoffmann <kraxel@redhat.com>

drivers/s390/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the S/390 specific device drivers

# Makefile for the S/390 specific device drivers

#

#





obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/

obj-y += cio/ block/ char/ crypto/ net/ scsi/ virtio/





drivers-y += drivers/s390/built-in.o

drivers-y += drivers/s390/built-in.o

drivers/s390/kvm/Makefile→drivers/s390/virtio/Makefile

+0 −0

File moved.

View file