Merge tag 'vfio-v6.6-rc1' of https://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - VFIO direct character device (cdev) interface support. This extracts
   the vfio device fd from the container and group model, and is
   intended to be the native uAPI for use with IOMMUFD (Yi Liu)

 - Enhancements to the PCI hot reset interface in support of cdev usage
   (Yi Liu)

 - Fix a potential race between registering and unregistering vfio files
   in the kvm-vfio interface and extend use of a lock to avoid extra
   drop and acquires (Dmitry Torokhov)

 - A new vfio-pci variant driver for the AMD/Pensando Distributed
   Services Card (PDS) Ethernet device, supporting live migration (Brett
   Creeley)

 - Cleanups to remove redundant owner setup in cdx and fsl bus drivers,
   and simplify driver init/exit in fsl code (Li Zetao)

 - Fix uninitialized hole in data structure and pad capability
   structures for alignment (Stefan Hajnoczi)

* tag 'vfio-v6.6-rc1' of https://github.com/awilliam/linux-vfio: (53 commits)
  vfio/pds: Send type for SUSPEND_STATUS command
  vfio/pds: fix return value in pds_vfio_get_lm_file()
  pds_core: Fix function header descriptions
  vfio: align capability structures
  vfio/type1: fix cap_migration information leak
  vfio/fsl-mc: Use module_fsl_mc_driver macro to simplify the code
  vfio/cdx: Remove redundant initialization owner in vfio_cdx_driver
  vfio/pds: Add Kconfig and documentation
  vfio/pds: Add support for firmware recovery
  vfio/pds: Add support for dirty page tracking
  vfio/pds: Add VFIO live migration support
  vfio/pds: register with the pds_core PF
  pds_core: Require callers of register/unregister to pass PF drvdata
  vfio/pds: Initial support for pds VFIO driver
  vfio: Commonize combine_ranges for use in other VFIO drivers
  kvm/vfio: avoid bouncing the mutex when adding and deleting groups
  kvm/vfio: ensure kvg instance stays around in kvm_vfio_group_add()
  docs: vfio: Add vfio device cdev description
  vfio: Compile vfio_group infrastructure optionally
  vfio: Move the IOMMU_CAP_CACHE_COHERENCY check in __vfio_register_dev()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/iommufd/device.c
Simple merge

diff --cc drivers/iommu/iommufd/iommufd_private.h
Simple merge

diff --cc drivers/iommu/iommufd/main.c
Simple merge

diff --cc drivers/net/ethernet/amd/pds_core/auxbus.c
index 6787a5f,4ebc8ad..11c23a7
--- 1/drivers/net/ethernet/amd/pds_core/auxbus.c
--- 2/drivers/net/ethernet/amd/pds_core/auxbus.c
+++ b/drivers/net/ethernet/amd/pds_core/auxbus.c
@@@ -8,13 -8,13 +8,13 @@@
  
  /**
   * pds_client_register - Link the client to the firmware
-  * @pf_pdev:  ptr to the PF driver struct
+  * @pf:               ptr to the PF driver's private data struct
   * @devname:  name that includes service into, e.g. pds_core.vDPA
   *
 - * Return: 0 on success, or
 + * Return: positive client ID (ci) on success, or
   *         negative for error
   */
- int pds_client_register(struct pci_dev *pf_pdev, char *devname)
+ int pds_client_register(struct pdsc *pf, char *devname)
  {
        union pds_core_adminq_comp comp = {};
        union pds_core_adminq_cmd cmd = {};

diff --cc drivers/s390/crypto/vfio_ap_ops.c
Simple merge

diff --cc drivers/vfio/pci/mlx5/cmd.c
Simple merge