Commit 9bb71526 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:

 - Some bug fixes

 - The new vdpa subsystem with two first drivers

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio-balloon: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
  vdpa: move to drivers/vdpa
  virtio: Intel IFC VF driver for VDPA
  vdpasim: vDPA device simulator
  vhost: introduce vDPA-based backend
  virtio: introduce a vDPA based transport
  vDPA: introduce vDPA bus
  vringh: IOTLB support
  vhost: factor out IOTLB
  vhost: allow per device message handler
  vhost: refine vhost and vringh kconfig
  virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
  virtio-net: Introduce hash report feature
  virtio-net: Introduce RSS receive steering feature
  virtio-net: Introduce extended RSC feature
  tools/virtio: option to build an out of tree module
parents ae46d2aa 835a6a64

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -17870,10 +17870,12 @@ L: virtualization@lists.linux-foundation.org 
S:	Maintained

F:	Documentation/devicetree/bindings/virtio/

F:	drivers/virtio/

F:	drivers/vdpa/

F:	tools/virtio/

F:	drivers/net/virtio_net.c

F:	drivers/block/virtio_blk.c

F:	include/linux/virtio*.h

F:	include/linux/vdpa.h

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

F:	drivers/crypto/virtio/

F:	mm/balloon_compaction.c
@@ -17941,6 +17943,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git 
S:	Maintained

F:	drivers/vhost/

F:	include/uapi/linux/vhost.h

F:	include/linux/vhost_iotlb.h















VIRTIO INPUT DRIVER















M:	Gerd Hoffmann <kraxel@redhat.com>

























arch/arm64/kvm/Kconfig



+0
−2






























Original line number
Diff line number
Diff line








@@ -64,6 +64,4 @@ config KVM_ARM_PMU













config KVM_INDIRECT_VECTORS















       def_bool KVM && (HARDEN_BRANCH_PREDICTOR || HARDEN_EL2_VECTORS)





























source "drivers/vhost/Kconfig"





























endif # VIRTUALIZATION
























arch/mips/kvm/Kconfig



+0
−2






























Original line number
Diff line number
Diff line








@@ -72,6 +72,4 @@ config KVM_MIPS_DEBUG_COP0_COUNTERS





























	  If unsure, say N.





























source "drivers/vhost/Kconfig"





























endif # VIRTUALIZATION
























arch/powerpc/kvm/Kconfig



+0
−2






























Original line number
Diff line number
Diff line








@@ -204,6 +204,4 @@ config KVM_XIVE













	default y















	depends on KVM_XICS && PPC_XIVE_NATIVE && KVM_BOOK3S_HV_POSSIBLE





























source "drivers/vhost/Kconfig"





























endif # VIRTUALIZATION
























arch/s390/kvm/Kconfig



+0
−4






























Original line number
Diff line number
Diff line








@@ -55,8 +55,4 @@ config KVM_S390_UCONTROL





























	  If unsure, say N.





























# OK, it's a little counter-intuitive to do this, but it puts it neatly under













# the virtualization menu.













source "drivers/vhost/Kconfig"





























endif # VIRTUALIZATION
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE