diff options
| author | Jerry Snitselaar <jsnitsel@redhat.com> | 2023-04-20 12:20:13 -0700 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2023-05-22 17:23:32 +0200 |
| commit | 8ec4e2befef10c7679cd59251956a428e783c0b5 (patch) | |
| tree | 058aaf946db3132f060fab4c4c78507a549613ac /scripts/checkpatch.pl | |
| parent | af47b0a24058e56e983881993752f88288ca6511 (diff) | |
| download | linux-stable-8ec4e2befef10c7679cd59251956a428e783c0b5.tar.gz linux-stable-8ec4e2befef10c7679cd59251956a428e783c0b5.tar.bz2 linux-stable-8ec4e2befef10c7679cd59251956a428e783c0b5.zip | |
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>
Diffstat (limited to 'scripts/checkpatch.pl')
0 files changed, 0 insertions, 0 deletions