From: Joerg Roedel <jroedel@suse.de>
Date: Tue, 8 Mar 2022 11:21:31 +0000 (+0100)
Subject: Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e17c6debd4b2d2d474074f83946f8c6522587566;p=linux.git

Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next
---

e17c6debd4b2d2d474074f83946f8c6522587566
diff --cc drivers/iommu/amd/amd_iommu.h
index bb95edf74415b,416815a525d67,416815a525d67,416815a525d67,416815a525d67,416815a525d67,3b2f06b7aca68,94d33626d692d..1ab31074f5b30
--- a/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