Merge branches 'arm/renesas', 'arm/qcom', 'arm/mediatek', 'arm/omap', 'arm/exynos...

diff --cc Documentation/arm64/silicon-errata.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/Makefile
index 342190196dfb068d07e1d7a9bd66d29bbcc7a237,342190196dfb068d07e1d7a9bd66d29bbcc7a237,342190196dfb068d07e1d7a9bd66d29bbcc7a237,342190196dfb068d07e1d7a9bd66d29bbcc7a237,342190196dfb068d07e1d7a9bd66d29bbcc7a237,342190196dfb068d07e1d7a9bd66d29bbcc7a237,2b8203db73ec3202918f971337a3f12104deb90b,342190196dfb068d07e1d7a9bd66d29bbcc7a237,342190196dfb068d07e1d7a9bd66d29bbcc7a237,342190196dfb068d07e1d7a9bd66d29bbcc7a237,f356bc12b1c7b7e3d5b3b7335c80e2b265ecdaf0..bfd1a9873091cb92f7ccbeb549e83c5fa68bcdcb
--- 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
--- 10/drivers/iommu/Makefile
--- 11/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@@@@@@@@@@ -11,19 -11,19 -11,19 -11,19 -11,19 -11,19 -11,19 -11,19 -11,19 -11,19 -12,11 +12,11 @@@@@@@@@@@@ obj-$(CONFIG_IOASID) += ioasid.
           obj-$(CONFIG_IOMMU_IOVA) += iova.o
           obj-$(CONFIG_OF_IOMMU)       += of_iommu.o
           obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o
---------- obj-$(CONFIG_AMD_IOMMU) += amd/iommu.o amd/init.o amd/quirks.o
---------- obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd/debugfs.o
---------- obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o
           obj-$(CONFIG_ARM_SMMU) += arm_smmu.o
------ ----arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o
++++++ ++++arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-nvidia.o arm-smmu-qcom.o
           obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
---------- obj-$(CONFIG_DMAR_TABLE) += intel/dmar.o
---------- obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o
---------- obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o
---------- obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel/debugfs.o
---------- obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o
           obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
---------- obj-$(CONFIG_IRQ_REMAP) += intel/irq_remapping.o irq_remapping.o
++++++++++ obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
           obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o
           obj-$(CONFIG_MTK_IOMMU_V1) += mtk_iommu_v1.o
           obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

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

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

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

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

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

diff --cc drivers/iommu/io-pgtable-arm.c
Simple merge

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

diff --cc drivers/iommu/ipmmu-vmsa.c
Simple merge

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

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

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

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

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