]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
projects / users / griffoul / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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()

1  2 
drivers/iommu/arm/arm-smmu/arm-smmu.c patch | diff1 | diff2 | blob | history

diff --cc drivers/iommu/arm/arm-smmu/arm-smmu.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.