Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Apr 2022 17:40:52 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Apr 2022 17:40:52 +0000 (10:40 -0700)
commit3e732ebf7316ac83e8562db7e64cc68aec390a18
tree1ad425dd9a7a6b78966ee26fc5eb64aa231db050
parente2a1256b17b16f9b9adf1b6fea56819e7b68e463
parent1c80cf031e0204fde471558ee40183695773ce13
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "Fixes and cleanups:

   - A couple of mlx5 fixes related to cvq

   - A couple of reverts dropping useless code (code that used it got
     reverted earlier)"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vdpa: mlx5: synchronize driver status with CVQ
  vdpa: mlx5: prevent cvq work from hogging CPU
  Revert "virtio_config: introduce a new .enable_cbs method"
  Revert "virtio: use virtio_device_ready() in virtio_device_restore()"