Merge 531d29b0 ("Merge tag 'iommu-updates-v5.10' of...

Merge 531d29b0 ("Merge tag 'iommu-updates-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu"

) into android-mainline

Steps on the way to 5.10-rc1

Resolves conflicts in:
        drivers/iommu/arm/arm-smmu/arm-smmu.c
        drivers/iommu/arm/arm-smmu/arm-smmu.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If295967f3cc66a76c442e72ceabb95365bfc2ff6