aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
authorMark Brown <broonie@kernel.org>2026-05-29 22:43:23 +0100
committerMark Brown <broonie@kernel.org>2026-05-29 22:43:23 +0100
commit4bc0e6d39b7c764e4345562c4ee398986939d1e0 (patch)
tree10e3fc67cf175b52a7b1e5d10d1d1dd66c1a1ee9 /MAINTAINERS
parentd4fbe67d77c3d934bbae2c1008293d3f1f1377f5 (diff)
parentac5fb67f6006bf80128340af67f9512fdaf75ae6 (diff)
downloadlinux-next-history-4bc0e6d39b7c764e4345562c4ee398986939d1e0.tar.gz
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS13
1 files changed, 11 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 143b4e97d47ae..ce36378c01192 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1158,8 +1158,9 @@ F: Documentation/arch/x86/amd-hfi.rst
F: drivers/platform/x86/amd/hfi/
AMD IOMMU (AMD-VI)
-M: Joerg Roedel <joro@8bytes.org>
+M: Joerg Roedel (AMD) <joro@8bytes.org>
R: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
+R: Vasant Hegde <vasant.hegde@amd.com>
L: iommu@lists.linux.dev
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
@@ -13584,7 +13585,7 @@ F: include/linux/iommu-dma.h
F: include/linux/iova.h
IOMMU SUBSYSTEM
-M: Joerg Roedel <joro@8bytes.org>
+M: Joerg Roedel (AMD) <joro@8bytes.org>
M: Will Deacon <will@kernel.org>
R: Robin Murphy <robin.murphy@arm.com>
L: iommu@lists.linux.dev
@@ -28138,6 +28139,14 @@ F: drivers/media/v4l2-core/v4l2-isp.c
F: include/media/v4l2-isp.h
F: include/uapi/linux/media/v4l2-isp.h
+VERISILICON IOMMU DRIVER
+M: Benjamin Gaignard <benjamin.gaignard@collabora.com>
+L: iommu@lists.linux.dev
+S: Maintained
+F: Documentation/devicetree/bindings/iommu/verisilicon,iommu.yaml
+F: drivers/iommu/vsi-iommu.c
+F: include/linux/vsi-iommu.h
+
VF610 NAND DRIVER
M: Stefan Agner <stefan@agner.ch>
L: linux-mtd@lists.infradead.org