Merge branches 'v5.10/vfio/fsl-mc-v6' and 'v5.10/vfio/zpci-info-v3' into v5.10/vfio...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/vfio/pci/vfio_pci.c
Simple merge

diff --cc include/uapi/linux/vfio.h
index e7c8b3a,95deac8,04fbe42..2f313a2
--- 1/include/uapi/linux/vfio.h
--- 2/include/uapi/linux/vfio.h
--- 3/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@@@ -201,8 -201,9 -201,10 +201,11 @@@@ struct vfio_device_info 
   #define VFIO_DEVICE_FLAGS_AMBA  (1 << 3)     /* vfio-amba device */
   #define VFIO_DEVICE_FLAGS_CCW        (1 << 4)        /* vfio-ccw device */
   #define VFIO_DEVICE_FLAGS_AP (1 << 5)        /* vfio-ap device */
+ +#define VFIO_DEVICE_FLAGS_FSL_MC (1 << 6)    /* vfio-fsl-mc device */
++ #define VFIO_DEVICE_FLAGS_CAPS       (1 << 7)        /* Info supports caps */
        __u32   num_regions;    /* Max region index + 1 */
        __u32   num_irqs;       /* Max IRQ index + 1 */
++      __u32   cap_offset;     /* Offset within info struct of first cap */
   };
   #define VFIO_DEVICE_GET_INFO         _IO(VFIO_TYPE, VFIO_BASE + 7)