]> www.infradead.org Git - users/jedix/linux-maple.git/commit
iommu/amd: Fix up merge conflict resolution
authorJerry Snitselaar <jsnitsel@redhat.com>
Thu, 20 Apr 2023 19:20:13 +0000 (12:20 -0700)
committerJoerg Roedel <jroedel@suse.de>
Mon, 22 May 2023 15:23:32 +0000 (17:23 +0200)
commit8ec4e2befef10c7679cd59251956a428e783c0b5
tree058aaf946db3132f060fab4c4c78507a549613ac
parentaf47b0a24058e56e983881993752f88288ca6511
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.

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>
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
Link: https://lore.kernel.org/r/20230420192013.733331-1-jsnitsel@redhat.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/amd/amd_iommu.h