Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next

2026-10-09 18:15:49 +00:00 · 2022-03-08 12:21:31 +01:00 · 2022-03-08 12:21:31 +01:00 · e17c6debd4
commit e17c6debd4
parent ffb217a13a 4f23f6d458 a063158b20 ae684caf46 6efd3b8356 e38432cb4b 97f2f2c531 9f968fc70d
41 changed files with 662 additions and 2251 deletions
--- a/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
+++ b/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
--- a/drivers/iommu/amd/iommu_v2.c
+++ b/drivers/iommu/amd/iommu_v2.c
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.h
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.h
--- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
+++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
--- a/drivers/iommu/intel/debugfs.c
+++ b/drivers/iommu/intel/debugfs.c
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
--- a/drivers/iommu/intel/pasid.c
+++ b/drivers/iommu/intel/pasid.c
--- a/drivers/iommu/intel/pasid.h
+++ b/drivers/iommu/intel/pasid.h
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
--- a/drivers/iommu/sprd-iommu.c
+++ b/drivers/iommu/sprd-iommu.c
--- a/drivers/iommu/sun50i-iommu.c
+++ b/drivers/iommu/sun50i-iommu.c
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
--- a/drivers/vdpa/vdpa_user/iova_domain.c
+++ b/drivers/vdpa/vdpa_user/iova_domain.c
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
--- a/include/linux/intel-svm.h
+++ b/include/linux/intel-svm.h
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
--- a/include/uapi/linux/iommu.h
+++ b/include/uapi/linux/iommu.h