iommu: amd: Fix up merge conflict resolution
Subsystems (2)
PATCH 1/1 iommu: amd: Fix up merge conflict resolution
Merge commit e17c6debd4b2 ("Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next") added amd_iommu_init_devices, amd_iommu_uninit_devices,
and amd_iommu_init_notifier back to drivers/iommu/amd/amd_iommu.h.
The only references to them are here, so clean them up.
--- drivers/iommu/amd/amd_iommu.h | 3 --- 1 file changed, 3 deletions(-)
drivers/iommu/amd/amd_iommu.h +0 -3
@@ -15,9 +15,6 @@ 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 (struct amd_iommu *iommu,u16 devid);extern void amd_iommu_restart_event_logging (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 void amd_iommu_set_rlookup_table (struct amd_iommu *iommu,u16 devid);#ifdef CONFIG_AMD_IOMMU_DEBUGFS
Signature · 1 line
2.38.1
Quoted 11 lines · Jerry Snitselaar
Merge commit
e17c6debd4b2("Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next") addedamd_iommu_init_devices,amd_iommu_uninit_devices,
andamd_iommu_init_notifierback todrivers/iommu/amd/amd_iommu.h.
The only references to them are here, so clean them up.Fixes e17c6debd4b2 ("Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next")Cc Joerg Roedel <[email protected]>Cc Suravee Suthikulpanit <[email protected]>Cc Will Deacon <[email protected]>Cc Robin Murphy <[email protected]>Signed-off-by Jerry Snitselaar <[email protected]>
Thanks for the fix.
-Vasant
Joerg Roedel
maintainerQuoted 2 lines · Jerry Snitselaar
drivers/iommu/amd/amd_iommu.h | 3 --- 1 file changed, 3 deletions(-)
Applied for 6.4, thanks.
s