diff options
| author | Jerry Snitselaar <[email protected]> | 2023-04-20 12:20:13 -0700 |
|---|---|---|
| committer | Joerg Roedel <[email protected]> | 2023-05-22 17:23:32 +0200 |
| commit | 8ec4e2befef10c7679cd59251956a428e783c0b5 (patch) | |
| tree | 058aaf946db3132f060fab4c4c78507a549613ac /tools/perf/scripts/python | |
| parent | af47b0a24058e56e983881993752f88288ca6511 (diff) | |
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 <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Robin Murphy <[email protected]>
Signed-off-by: Jerry Snitselaar <[email protected]>
Reviewed-by: Vasant Hegde <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Joerg Roedel <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions