Merge branch 'v5.12/vfio/next-vaddr' into v5.12/vfio/next

diff --cc drivers/vfio/vfio_iommu_type1.c
index 706b88b5d4ee8c43c71a9f53050f94e41e75bff7,6cf1dad501d02e911974f13e032f41fd3853e3e4..ec9fd95a138b81044911a7cb93313a24f618a0e0
--- 1/drivers/vfio/vfio_iommu_type1.c
--- 2/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@@ -69,8 -70,9 +70,10 @@@ struct vfio_iommu 
        struct rb_root          dma_list;
        struct blocking_notifier_head notifier;
        unsigned int            dma_avail;
+       unsigned int            vaddr_invalid_count;
        uint64_t                pgsize_bitmap;
 +      uint64_t                num_non_pinned_groups;
+       wait_queue_head_t       vaddr_wait;
        bool                    v2;
        bool                    nesting;
        bool                    dirty_page_tracking;