Merge branches 'arm/smmu', 'mediatek', 's390', 'ti/omap', 'riscv' and 'core' into next

2026-10-20 19:23:40 +00:00 · 2024-11-15 09:27:02 +01:00 · 2024-11-15 09:27:02 +01:00 · ae3325f752
commit ae3325f752
parent 2d5404caa8 9af48bbbae 3ab21ad3d5 ecda483339 95b6235e36 488ffbf181 fcdb982e93
34 changed files with 3333 additions and 470 deletions
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
--- a/Documentation/devicetree/bindings/iommu/riscv,iommu.yaml
+++ b/Documentation/devicetree/bindings/iommu/riscv,iommu.yaml
--- a/9
+++ b/9
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
--- 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/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-v3/tegra241-cmdqv.c
+++ b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
--- a/drivers/iommu/iommu-sysfs.c
+++ b/drivers/iommu/iommu-sysfs.c
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
--- a/drivers/iommu/riscv/Kconfig
+++ b/drivers/iommu/riscv/Kconfig
--- a/drivers/iommu/riscv/Makefile
+++ b/drivers/iommu/riscv/Makefile
--- a/drivers/iommu/riscv/iommu-bits.h
+++ b/drivers/iommu/riscv/iommu-bits.h
--- a/drivers/iommu/riscv/iommu-pci.c
+++ b/drivers/iommu/riscv/iommu-pci.c
--- a/drivers/iommu/riscv/iommu-platform.c
+++ b/drivers/iommu/riscv/iommu-platform.c
--- a/drivers/iommu/riscv/iommu.c
+++ b/drivers/iommu/riscv/iommu.c
--- a/drivers/iommu/riscv/iommu.h
+++ b/drivers/iommu/riscv/iommu.h
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
--- a/drivers/media/platform/nvidia/tegra-vde/iommu.c
+++ b/drivers/media/platform/nvidia/tegra-vde/iommu.c
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
--- a/include/uapi/linux/iommufd.h
+++ b/include/uapi/linux/iommufd.h