diff options
| author | Will Deacon <will@kernel.org> | 2021-06-16 11:30:55 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-06-16 11:30:55 +0100 |
| commit | ddd25670d39b2181c7bec33301f2d24cdcf25dde (patch) | |
| tree | b87ed010ae0fa8d68822c5dc369032a015470fa4 /drivers/iommu/rockchip-iommu.c | |
| parent | affa909571b0036b5d46aeff940ad4358f4abe1d (diff) | |
| parent | b472191f0a0ce6d98d61e939118cfd6ad0ff91e7 (diff) | |
Merge branch 'for-thierry/arm-smmu' into for-joerg/arm-smmu/updates
Merge in support for the Arm SMMU '->probe_finalize()' implementation
callback, which is required to prevent early faults in conjunction with
Nvidia's memory controller.
* for-thierry/arm-smmu:
iommu/arm-smmu: Check smmu->impl pointer before dereferencing
iommu/arm-smmu: Implement ->probe_finalize()
Diffstat (limited to 'drivers/iommu/rockchip-iommu.c')
0 files changed, 0 insertions, 0 deletions