From: Will Deacon <will@kernel.org>
Date: Wed, 16 Jun 2021 10:30:55 +0000 (+0100)
Subject: Merge branch 'for-thierry/arm-smmu' into for-joerg/arm-smmu/updates
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ddd25670d39b2181c7bec33301f2d24cdcf25dde;p=linux.git

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()
---

ddd25670d39b2181c7bec33301f2d24cdcf25dde