* [PATCH] iommu: amd: Fix up merge conflict resolution
@ 2023-04-20 19:20 Jerry Snitselaar
2023-04-21 6:19 ` Vasant Hegde
2023-05-22 15:24 ` Joerg Roedel
0 siblings, 2 replies; 3+ messages in thread
From: Jerry Snitselaar @ 2023-04-20 19:20 UTC (permalink / raw)
To: linux-kernel, iommu
Cc: Joerg Roedel, Suravee Suthikulpanit, Will Deacon, Robin Murphy
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.
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 <joro@8bytes.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
drivers/iommu/amd/amd_iommu.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index c160a332ce33..ec139f540c08 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -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
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] iommu: amd: Fix up merge conflict resolution
2023-04-20 19:20 [PATCH] iommu: amd: Fix up merge conflict resolution Jerry Snitselaar
@ 2023-04-21 6:19 ` Vasant Hegde
2023-05-22 15:24 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Vasant Hegde @ 2023-04-21 6:19 UTC (permalink / raw)
To: Jerry Snitselaar, linux-kernel, iommu
Cc: Joerg Roedel, Suravee Suthikulpanit, Will Deacon, Robin Murphy
On 4/21/2023 12:50 AM, Jerry Snitselaar wrote:
> 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.
>
> 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 <joro@8bytes.org>
> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Thanks for the fix.
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Vasant
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iommu: amd: Fix up merge conflict resolution
2023-04-20 19:20 [PATCH] iommu: amd: Fix up merge conflict resolution Jerry Snitselaar
2023-04-21 6:19 ` Vasant Hegde
@ 2023-05-22 15:24 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2023-05-22 15:24 UTC (permalink / raw)
To: Jerry Snitselaar
Cc: linux-kernel, iommu, Suravee Suthikulpanit, Will Deacon,
Robin Murphy
On Thu, Apr 20, 2023 at 12:20:13PM -0700, Jerry Snitselaar wrote:
> drivers/iommu/amd/amd_iommu.h | 3 ---
> 1 file changed, 3 deletions(-)
Applied for 6.4, thanks.
s
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-22 15:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-20 19:20 [PATCH] iommu: amd: Fix up merge conflict resolution Jerry Snitselaar
2023-04-21 6:19 ` Vasant Hegde
2023-05-22 15:24 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox