git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: affa909 b472191)
Merge branch 'for-thierry/arm-smmu' into for-joerg/arm-smmu/updates
authorWill Deacon <will@kernel.org>
Wed, 16 Jun 2021 10:30:55 +0000 (11:30 +0100)
committerWill Deacon <will@kernel.org>
Wed, 16 Jun 2021 10:30:55 +0000 (11:30 +0100)
commitddd25670d39b2181c7bec33301f2d24cdcf25dde
treeb87ed010ae0fa8d68822c5dc369032a015470fa4tree
parentaffa909571b0036b5d46aeff940ad4358f4abe1dcommit | diff
parentb472191f0a0ce6d98d61e939118cfd6ad0ff91e7commit | 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()
drivers/iommu/arm/arm-smmu/arm-smmu.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.