projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 759aaa1 1be08f4)
Merge branch 'for-joerg/arm-smmu/fixes' into for-joerg/arm-smmu/updates
authorWill Deacon <will@kernel.org>
Mon, 4 Nov 2019 19:33:59 +0000 (19:33 +0000)
committerWill Deacon <will@kernel.org>
Mon, 4 Nov 2019 19:33:59 +0000 (19:33 +0000)
Merge in ARM SMMU fixes to avoid conflicts in the ARM io-pgtable code.

* for-joerg/arm-smmu/fixes:
  iommu/io-pgtable-arm: Support all Mali configurations
  iommu/io-pgtable-arm: Correct Mali attributes
  iommu/arm-smmu: Free context bitmap in the err path of arm_smmu_init_domain_context

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

diff --cc drivers/iommu/arm-smmu.c
Simple merge
diff --cc drivers/iommu/io-pgtable-arm.c
Simple merge
Domain: System / Kernel;