From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 11 Sep 2019 10:39:19 +0000 (+0200)
Subject: Merge branches 'arm/omap', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/qcom',... 
X-Git-Tag: v5.4-rc1~193^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e95adb9add75affb98570a518c902f50e5fcce1b;p=users%2Fhch%2Fblock.git

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

e95adb9add75affb98570a518c902f50e5fcce1b
diff --cc drivers/iommu/Makefile
index f13f36ae1af6,f13f36ae1af6,f13f36ae1af6,a2729aadd300,a2729aadd300,f13f36ae1af6,f13f36ae1af6,c6a277e69848,bfe27b2755bd,f13f36ae1af6..4f405f926e73
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@@@@@@@@@ -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 +10,10 @@@@@@@@@@@ obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += 
          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_iommu_init.o
+++++++ ++obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o
          obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o
          obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
---  -----obj-$(CONFIG_ARM_SMMU) += arm-smmu.o
+++  +++++obj-$(CONFIG_ARM_SMMU) += arm-smmu.o arm-smmu-impl.o
          obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
          obj-$(CONFIG_DMAR_TABLE) += dmar.o
          obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o