Merge tag 'v5.7-rc7' into x86/amd

Linux 5.7-rc7

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

diff --cc drivers/iommu/amd_iommu_types.h
Simple merge

diff --cc drivers/iommu/iommu.c
index 4050569188bec8e26ee42ccfb5874b3f32708739,1faa08c8bbb4dd3f39853fc357d49c4ac9c7364c..629d209b8e884dd63bcf71e5b38a5706c375932b
--- 1/drivers/iommu/iommu.c
--- 2/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@@ -819,9 -752,11 +828,9 @@@ rename
  
        dev->iommu_group = group;
  
 -      iommu_group_create_direct_mappings(group, dev);
 -
        mutex_lock(&group->mutex);
        list_add_tail(&device->list, &group->devices);
-       if (group->domain)
+       if (group->domain  && !iommu_is_attach_deferred(group->domain, dev))
                ret = __iommu_attach_device(group->domain, dev);
        mutex_unlock(&group->mutex);
        if (ret)

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