Commit 2ef32ad2 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 updates from Michael Tsirkin:
 "Several new features here:

   - virtio-net is finally supported in vduse

   - virtio (balloon and mem) interaction with suspend is improved

   - vhost-scsi now handles signals better/faster

  And fixes, cleanups all over the place"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (48 commits)
  virtio-pci: Check if is_avq is NULL
  virtio: delete vq in vp_find_vqs_msix() when request_irq() fails
  MAINTAINERS: add Eugenio Pérez as reviewer
  vhost-vdpa: Remove usage of the deprecated ida_simple_xx() API
  vp_vdpa: don't allocate unused msix vectors
  sound: virtio: drop owner assignment
  fuse: virtio: drop owner assignment
  scsi: virtio: drop owner assignment
  rpmsg: virtio: drop owner assignment
  nvdimm: virtio_pmem: drop owner assignment
  wifi: mac80211_hwsim: drop owner assignment
  vsock/virtio: drop owner assignment
  net: 9p: virtio: drop owner assignment
  net: virtio: drop owner assignment
  net: caif: virtio: drop owner assignment
  misc: nsm: drop owner assignment
  iommu: virtio: drop owner assignment
  drm/virtio: drop owner assignment
  gpio: virtio: drop owner assignment
  firmware: arm_scmi: virtio: drop owner assignment
  ...
parents c760b372 c8fae27d

MAINTAINERS

+8 −2
Original line number Diff line number Diff line
@@ -10654,8 +10654,10 @@ F: include/net/nl802154.h 
F:	net/ieee802154/

F:	net/mac802154/









IFCVF VIRTIO DATA PATH ACCELERATOR









R:	Zhu Lingshan <lingshan.zhu@intel.com>









Intel VIRTIO DATA PATH ACCELERATOR









M:	Zhu Lingshan <lingshan.zhu@intel.com>









L:	virtualization@lists.linux.dev









S:	Supported









F:	drivers/vdpa/ifcvf/

















IFE PROTOCOL








@@ -23746,6 +23748,7 @@ M:	"Michael S. Tsirkin" <mst@redhat.com>







M:	Jason Wang <jasowang@redhat.com>









R:	Paolo Bonzini <pbonzini@redhat.com>









R:	Stefan Hajnoczi <stefanha@redhat.com>









R:	Eugenio Pérez <eperezma@redhat.com>









L:	virtualization@lists.linux.dev









S:	Maintained









F:	drivers/block/virtio_blk.c








@@ -23764,6 +23767,7 @@ VIRTIO CORE AND NET DRIVERS







M:	"Michael S. Tsirkin" <mst@redhat.com>









M:	Jason Wang <jasowang@redhat.com>









R:	Xuan Zhuo <xuanzhuo@linux.alibaba.com>









R:	Eugenio Pérez <eperezma@redhat.com>









L:	virtualization@lists.linux.dev









S:	Maintained









F:	Documentation/ABI/testing/sysfs-bus-vdpa








@@ -23805,6 +23809,7 @@ VIRTIO FILE SYSTEM







M:	Vivek Goyal <vgoyal@redhat.com>









M:	Stefan Hajnoczi <stefanha@redhat.com>









M:	Miklos Szeredi <miklos@szeredi.hu>









R:	Eugenio Pérez <eperezma@redhat.com>









L:	virtualization@lists.linux.dev









L:	linux-fsdevel@vger.kernel.org









S:	Supported








@@ -23838,6 +23843,7 @@ F:	include/uapi/linux/virtio_gpu.h







VIRTIO HOST (VHOST)









M:	"Michael S. Tsirkin" <mst@redhat.com>









M:	Jason Wang <jasowang@redhat.com>









R:	Eugenio Pérez <eperezma@redhat.com>









L:	kvm@vger.kernel.org









L:	virtualization@lists.linux.dev









L:	netdev@vger.kernel.org

























arch/um/drivers/virt-pci.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -752,7 +752,6 @@ MODULE_DEVICE_TABLE(virtio, id_table);

















static struct virtio_driver um_pci_virtio_driver = {









	.driver.name = "virtio-pci",









	.driver.owner = THIS_MODULE,









	.id_table = id_table,









	.probe = um_pci_virtio_probe,









	.remove = um_pci_virtio_remove,
































drivers/block/virtio_blk.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -1658,7 +1658,6 @@ static struct virtio_driver virtio_blk = {







	.feature_table_legacy		= features_legacy,









	.feature_table_size_legacy	= ARRAY_SIZE(features_legacy),









	.driver.name			= KBUILD_MODNAME,









	.driver.owner			= THIS_MODULE,









	.id_table			= id_table,









	.probe				= virtblk_probe,









	.remove				= virtblk_remove,
































drivers/bluetooth/virtio_bt.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -415,7 +415,6 @@ static const unsigned int virtbt_features[] = {

















static struct virtio_driver virtbt_driver = {









	.driver.name         = KBUILD_MODNAME,









	.driver.owner        = THIS_MODULE,









	.feature_table       = virtbt_features,









	.feature_table_size  = ARRAY_SIZE(virtbt_features),









	.id_table            = virtbt_table,
































drivers/char/hw_random/virtio-rng.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -245,7 +245,6 @@ static const struct virtio_device_id id_table[] = {

















static struct virtio_driver virtio_rng_driver = {









	.driver.name =	KBUILD_MODNAME,









	.driver.owner =	THIS_MODULE,









	.id_table =	id_table,









	.probe =	virtrng_probe,









	.remove =	virtrng_remove,