Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'arm/smmu', 'x86/amd', 'x86...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/arm-smmu-v3.c
index aa3ac2a03807f6db12f9546a3eb65a90547d962b,aa3ac2a03807f6db12f9546a3eb65a90547d962b,aa3ac2a03807f6db12f9546a3eb65a90547d962b,aa3ac2a03807f6db12f9546a3eb65a90547d962b,a7222dd5b11704f9e4a0f5fa635f9a2714f27974,aa3ac2a03807f6db12f9546a3eb65a90547d962b,aa3ac2a03807f6db12f9546a3eb65a90547d962b,aa3ac2a03807f6db12f9546a3eb65a90547d962b,2b68498dfb6622cdbbfeaeee0fdde29060e4d62a..82508730feb7a188a3be3e10ae00a4119a9677ab
--- 1/drivers/iommu/arm-smmu-v3.c
--- 2/drivers/iommu/arm-smmu-v3.c
--- 3/drivers/iommu/arm-smmu-v3.c
--- 4/drivers/iommu/arm-smmu-v3.c
--- 5/drivers/iommu/arm-smmu-v3.c
--- 6/drivers/iommu/arm-smmu-v3.c
--- 7/drivers/iommu/arm-smmu-v3.c
--- 8/drivers/iommu/arm-smmu-v3.c
--- 9/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@@@@@@@@@ -2850,9 -2850,9 -2850,9 -2850,9 -2990,11 -2850,9 -2850,9 -2850,9 -2850,9 +2990,11 @@@@@@@@@@ static int arm_smmu_add_device(struct d
         
         err_unlink:
                iommu_device_unlink(&smmu->iommu, dev);
++++ ++++err_disable_pasid:
++++ ++++       arm_smmu_disable_pasid(master);
         err_free_master:
                kfree(master);
--------        fwspec->iommu_priv = NULL;
++++++++        dev_iommu_priv_set(dev, NULL);
                return ret;
         }
         

diff --cc drivers/iommu/intel-svm.c
Simple merge

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

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

diff --cc include/linux/device.h
Simple merge