Merge tag 'v6.1-rc7' into iommufd.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Tue, 29 Nov 2022 20:42:27 +0000 (16:42 -0400)
committerJason Gunthorpe <jgg@nvidia.com>
Fri, 2 Dec 2022 16:04:39 +0000 (12:04 -0400)
commit90337f526c98129b0b180fc52dc5f57d8e7a8614
treed7458a03027cde56b8191f656dc5cdf1531a767d
parent169dd5c987e60e62aa5785b30d22ded2ae000286
parentb7b275e60bcd5f89771e865a8239325f86d9927d
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>
MAINTAINERS
drivers/dma/idxd/cdev.c
drivers/dma/idxd/init.c
drivers/gpu/drm/i915/gvt/kvmgt.c
drivers/iommu/intel/iommu.c
drivers/iommu/intel/pasid.c
drivers/vfio/vfio_main.c
include/linux/vfio.h