Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu...

diff --cc drivers/iommu/amd/amd_iommu.h
index bb95edf74415b0a6806237ade2382c8090e1b465,416815a525d671916a896297b67b28006bb03236,416815a525d671916a896297b67b28006bb03236,416815a525d671916a896297b67b28006bb03236,416815a525d671916a896297b67b28006bb03236,416815a525d671916a896297b67b28006bb03236,3b2f06b7aca68d3c858bbc2c0e3fc0ea7c9e0c6a,94d33626d692db494ee09fe8c906828ec9b082de..1ab31074f5b30fa85cd744a38d6569a3a52b50dc
--- 1/drivers/iommu/amd/amd_iommu.h
--- 2/drivers/iommu/amd/amd_iommu.h
--- 3/drivers/iommu/amd/amd_iommu.h
--- 4/drivers/iommu/amd/amd_iommu.h
--- 5/drivers/iommu/amd/amd_iommu.h
--- 6/drivers/iommu/amd/amd_iommu.h
--- 7/drivers/iommu/amd/amd_iommu.h
--- 8/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@@@@@@@@ -14,11 -14,10 -14,10 -14,10 -14,10 -14,10 -14,10 -14,6 +14,10 @@@@@@@@@
        extern irqreturn_t amd_iommu_int_thread(int irq, void *data);
        extern irqreturn_t amd_iommu_int_handler(int irq, void *data);
        extern void amd_iommu_apply_erratum_63(u16 devid);
 ------ extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);
 +++++++extern void amd_iommu_restart_event_logging(struct amd_iommu *iommu);
-       extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);
       +extern int amd_iommu_init_devices(void);
       +extern void amd_iommu_uninit_devices(void);
       +extern void amd_iommu_init_notifier(void);
        extern int amd_iommu_init_api(void);
        
        #ifdef CONFIG_AMD_IOMMU_DEBUGFS

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

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

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

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

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

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

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

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

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

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

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

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