From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 29 Jul 2020 12:42:00 +0000 (+0200)
Subject: Merge branches 'arm/renesas', 'arm/qcom', 'arm/mediatek', 'arm/omap', 'arm/exynos... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/56fbacc9bf23d372d78eef3809c1ac93d88e11f4

Merge branches 'arm/renesas', 'arm/qcom', 'arm/mediatek', 'arm/omap', 'arm/exynos', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'core' into next
---

56fbacc9bf23d372d78eef3809c1ac93d88e11f4
diff --cc drivers/iommu/Makefile
index 342190196dfb,342190196dfb,342190196dfb,342190196dfb,342190196dfb,342190196dfb,2b8203db73ec,342190196dfb,342190196dfb,342190196dfb,f356bc12b1c7..bfd1a9873091
--- a/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