Re: [PATCH] iommu: amd: Fix up merge conflict resolution

[Vasant Hegde]

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@xxxxxxxxxx>
> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@xxxxxxx>
> Cc: Will Deacon <will@xxxxxxxxxx>
> Cc: Robin Murphy <robin.murphy@xxxxxxx>
> Signed-off-by: Jerry Snitselaar <jsnitsel@xxxxxxxxxx>

Thanks for the fix.

Reviewed-by: Vasant Hegde <vasant.hegde@xxxxxxx>

-Vasant