Merge branches 'iommu/fixes', 'arm/mediatek', 'arm/smmu', 'arm/exynos', 'unisoc'...

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/Makefile
index 61bd30cd8369292d69423a45d724314918e2ee6c,61bd30cd8369292d69423a45d724314918e2ee6c,61bd30cd8369292d69423a45d724314918e2ee6c,61bd30cd8369292d69423a45d724314918e2ee6c,61bd30cd8369292d69423a45d724314918e2ee6c,5925b6af2123e543f1c32040eb567be842d17a68,61bd30cd8369292d69423a45d724314918e2ee6c,61bd30cd8369292d69423a45d724314918e2ee6c,60fafc23dee6e7e0fac115ca916ce4b940b082da..c0fb0ba8814372455c68c1173616edb470b128eb
--- 1/drivers/iommu/Makefile
--- 2/drivers/iommu/Makefile
--- 3/drivers/iommu/Makefile
--- 4/drivers/iommu/Makefile
--- 5/drivers/iommu/Makefile
--- 6/drivers/iommu/Makefile
--- 7/drivers/iommu/Makefile
--- 8/drivers/iommu/Makefile
--- 9/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@@@@@@@@ -27,4 -27,4 -27,4 -27,4 -27,4 -27,5 -27,4 -27,4 -27,5 +27,5 @@@@@@@@@@ obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fs
         obj-$(CONFIG_S390_IOMMU) += s390-iommu.o
         obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o
         obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o
---------obj-$(CONFIG_IOMMU_SVA_LIB) += iommu-sva-lib.o
        -obj-$(CONFIG_IOMMU_SVA_LIB) += io-pgfault.o
+++++++++obj-$(CONFIG_IOMMU_SVA_LIB) += iommu-sva-lib.o io-pgfault.o
+++++ +++obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o

diff --cc drivers/iommu/amd/init.c
Simple merge

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

diff --cc drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
Simple merge

diff --cc drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
Simple merge

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

diff --cc drivers/vfio/vfio_iommu_type1.c
Simple merge

diff --cc drivers/vhost/vdpa.c
Simple merge

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