Merge tag 'v6.1-rc7' into iommufd.git for-next

Resolve conflicts in drivers/vfio/vfio_main.c by using the iommfd version.
The rc fix was done a different way when iommufd patches reworked this
code.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma/idxd/cdev.c
Simple merge

diff --cc drivers/dma/idxd/init.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/kvmgt.c
index f5164099c264ef24cececedfce76b9e2278a0ea7,714221f9a13154050389e7fc76cb102a014bc714..6f107628ec3850ca6d5fb032c83b1c3e97ca95b5
--- 1/drivers/gpu/drm/i915/gvt/kvmgt.c
--- 2/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@@ -671,8 -669,12 +669,9 @@@ static int intel_vgpu_open_device(struc
  
        vgpu->attached = true;
  
 -      kvmgt_protect_table_init(vgpu);
 -      gvt_cache_init(vgpu);
 -
        vgpu->track_node.track_write = kvmgt_page_track_write;
        vgpu->track_node.track_flush_slot = kvmgt_page_track_flush_slot;
+       kvm_get_kvm(vgpu->vfio_device.kvm);
        kvm_page_track_register_notifier(vgpu->vfio_device.kvm,
                                         &vgpu->track_node);
  

diff --cc drivers/iommu/intel/iommu.c
Simple merge

diff --cc drivers/iommu/intel/pasid.c
Simple merge

diff --cc drivers/vfio/vfio_main.c
Simple merge

diff --cc include/linux/vfio.h
Simple merge