[PATCH v3] MAINTAINERS: merge SWIOTLB SUBSYSTEM into DMA MAPPING HELPERS

[Lukas Bulwahn]

Commit 78013eaadf69 ("x86: remove the IOMMU table infrastructure")
refactored the generic swiotlb/swiotlb-xen setup into pci-dma.c, but
misses to adjust MAINTAINERS.

Hence, ./scripts/get_maintainer.pl --self-test=patterns complains about
broken references.

As only include/linux/swiotlb.h is unique to the SWIOTLB SUBSYSTEM section
and Christoph is maintainer of DMA MAPPING HELPERS and SWIOTLB SUBSYSTEM,
just merge those two sections.

Leave the small architecture-dependent pieces to the arch maintainers.

Further, update the XEN SWIOTLB SUBSYSTEM to include all swiotlb-xen
headers and replace the pattern in drivers with the specific one file that
matches this pattern.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
Acked-by: Juergen Gross <jgross@xxxxxxxx>
---
v1: https://lore.kernel.org/lkml/20220601075613.28245-1-lukas.bulwahn@xxxxxxxxx/
v1 -> v2: https://lore.kernel.org/lkml/20220919084744.3043-1-lukas.bulwahn@xxxxxxxxx/
  addressed Christoph's comment, removed arch/*/kernel/pci-swiotlb.c
  added Juergen's ack
v2 -> v3: 
  merged sections as requested by Christoph

Christoph, please pick this minor non-urgent clean-up patch for swiotlb.

 MAINTAINERS | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0d06f0b2861a..52f31f11bb0b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6166,6 +6166,7 @@ F:	include/asm-generic/dma-mapping.h
 F:	include/linux/dma-direct.h
 F:	include/linux/dma-mapping.h
 F:	include/linux/dma-map-ops.h
+F:	include/linux/swiotlb.h
 F:	kernel/dma/
 
 DMA MAPPING BENCHMARK
@@ -19739,16 +19740,6 @@ S:	Maintained
 F:	Documentation/admin-guide/svga.rst
 F:	arch/x86/boot/video*
 
-SWIOTLB SUBSYSTEM
-M:	Christoph Hellwig <hch@xxxxxxxxxxxxx>
-L:	iommu@xxxxxxxxxxxxxxx
-S:	Supported
-W:	http://git.infradead.org/users/hch/dma-mapping.git
-T:	git git://git.infradead.org/users/hch/dma-mapping.git
-F:	arch/*/kernel/pci-swiotlb.c
-F:	include/linux/swiotlb.h
-F:	kernel/dma/swiotlb.c
-
 SWITCHDEV
 M:	Jiri Pirko <jiri@xxxxxxxxxxx>
 M:	Ivan Vecera <ivecera@xxxxxxxxxx>
@@ -22457,8 +22448,10 @@ M:	Stefano Stabellini <sstabellini@xxxxxxxxxx>
 L:	xen-devel@xxxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
 L:	iommu@xxxxxxxxxxxxxxx
 S:	Supported
-F:	arch/x86/xen/*swiotlb*
-F:	drivers/xen/*swiotlb*
+F:	arch/*/include/asm/xen/swiotlb-xen.h
+F:	drivers/xen/swiotlb-xen.c
+F:	include/xen/arm/swiotlb-xen.h
+F:	include/xen/swiotlb-xen.h
 
 XFS FILESYSTEM
 C:	irc://irc.oftc.net/xfs
-- 
2.17.1