From: Will Deacon <will@kernel.org>
Date: Mon, 4 Nov 2019 19:33:59 +0000 (+0000)
Subject: Merge branch 'for-joerg/arm-smmu/fixes' into for-joerg/arm-smmu/updates
X-Git-Tag: v5.5-rc1~77^2^7~2^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=db22a9de7a785fd3e0e066b02c269d6bdf453aec;p=linux.git

Merge branch 'for-joerg/arm-smmu/fixes' into for-joerg/arm-smmu/updates

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

db22a9de7a785fd3e0e066b02c269d6bdf453aec