]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jan 2022 08:05:48 +0000 (10:05 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jan 2022 08:05:48 +0000 (10:05 +0200)
commit3bf6a9e36e441714928d73a5adbc59562eb7ef19
tree736a123fe4be1ef70ec02ce52f6bc25f39a1f87c
parent46a10fc3a2beddd79dafc3cd800f14bde0844387
parentb03fc43e73877e180c1803a33aea3e7396642367
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin:
 "virtio,vdpa,qemu_fw_cfg: features, cleanups, and fixes.

   - partial support for < MAX_ORDER - 1 granularity for virtio-mem

   - driver_override for vdpa

   - sysfs ABI documentation for vdpa

   - multiqueue config support for mlx5 vdpa

   - and misc fixes, cleanups"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (42 commits)
  vdpa/mlx5: Fix tracking of current number of VQs
  vdpa/mlx5: Fix is_index_valid() to refer to features
  vdpa: Protect vdpa reset with cf_mutex
  vdpa: Avoid taking cf_mutex lock on get status
  vdpa/vdpa_sim_net: Report max device capabilities
  vdpa: Use BIT_ULL for bit operations
  vdpa/vdpa_sim: Configure max supported virtqueues
  vdpa/mlx5: Report max device capabilities
  vdpa: Support reporting max device capabilities
  vdpa/mlx5: Restore cur_num_vqs in case of failure in change_num_qps()
  vdpa: Add support for returning device configuration information
  vdpa/mlx5: Support configuring max data virtqueue
  vdpa/mlx5: Fix config_attr_mask assignment
  vdpa: Allow to configure max data virtqueues
  vdpa: Read device configuration only if FEATURES_OK
  vdpa: Sync calls set/get config/status with cf_mutex
  vdpa/mlx5: Distribute RX virtqueues in RQT object
  vdpa: Provide interface to read driver features
  vdpa: clean up get_config_size ret value handling
  virtio_ring: mark ring unused on error
  ...
12 files changed:
MAINTAINERS
arch/um/drivers/virt-pci.c
drivers/block/virtio_blk.c
drivers/bluetooth/virtio_bt.c
drivers/iommu/virtio-iommu.c
drivers/net/virtio_net.c
drivers/net/wireless/mac80211_hwsim.c
drivers/rpmsg/virtio_rpmsg_bus.c
drivers/scsi/virtio_scsi.c
drivers/vdpa/mlx5/net/mlx5_vnet.c
fs/fuse/virtio_fs.c
net/9p/trans_virtio.c