From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 29 May 2020 15:10:09 +0000 (+0200)
Subject: Merge tag 'v5.7-rc7' into x86/amd
X-Git-Tag: v5.8-rc1~26^2~3^8~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4c201d58cfee8631350888bad9e8bae33e628605;p=linux-block.git

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

Linux 5.7-rc7
---

4c201d58cfee8631350888bad9e8bae33e628605
diff --cc drivers/iommu/iommu.c
index 4050569188be,1faa08c8bbb4..629d209b8e88
--- a/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)