Merge tag 'for-6.0/dm-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 89e42cf..c8375b6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10233,7 +10233,6 @@ L:      iommu@lists.linux.dev
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 F:     drivers/iommu/intel/
-F:     include/linux/intel-iommu.h
 F:     include/linux/intel-svm.h
 
 INTEL IOP-ADMA DMA DRIVER
@@ -10605,9 +10604,20 @@ T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 F:     fs/iomap/
 F:     include/linux/iomap.h
 
-IOMMU DRIVERS
+IOMMU DMA-API LAYER
+M:     Robin Murphy <robin.murphy@arm.com>
+L:     iommu@lists.linux.dev
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
+F:     drivers/iommu/dma-iommu.c
+F:     drivers/iommu/iova.c
+F:     include/linux/dma-iommu.h
+F:     include/linux/iova.h
+
+IOMMU SUBSYSTEM
 M:     Joerg Roedel <joro@8bytes.org>
 M:     Will Deacon <will@kernel.org>
+R:     Robin Murphy <robin.murphy@arm.com>
 L:     iommu@lists.linux.dev
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git