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 9fbc30d..c8375b6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3501,7 +3501,7 @@ W:        https://wireless.wiki.kernel.org/en/users/Drivers/b43
 F:     drivers/net/wireless/broadcom/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
-M:     Lee Jones <lee.jones@linaro.org>
+M:     Lee Jones <lee@kernel.org>
 M:     Daniel Thompson <daniel.thompson@linaro.org>
 M:     Jingoo Han <jingoohan1@gmail.com>
 L:     dri-devel@lists.freedesktop.org
@@ -4912,6 +4912,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/sound/cirrus,cs*
 F:     include/dt-bindings/sound/cs*
 F:     sound/pci/hda/cs*
+F:     sound/pci/hda/hda_cs_dsp_ctl.*
 F:     sound/soc/codecs/cs*
 
 CIRRUS LOGIC DSP FIRMWARE DRIVER
@@ -5668,7 +5669,7 @@ L:        linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-kernel-mm-damon
 F:     Documentation/admin-guide/mm/damon/
-F:     Documentation/vm/damon/
+F:     Documentation/mm/damon/
 F:     include/linux/damon.h
 F:     include/trace/events/damon.h
 F:     mm/damon/
@@ -5998,6 +5999,7 @@ W:        http://www.dialog-semiconductor.com/products
 F:     Documentation/devicetree/bindings/input/da90??-onkey.txt
 F:     Documentation/devicetree/bindings/input/dlg,da72??.txt
 F:     Documentation/devicetree/bindings/mfd/da90*.txt
+F:     Documentation/devicetree/bindings/mfd/da90*.yaml
 F:     Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
 F:     Documentation/devicetree/bindings/regulator/da92*.txt
 F:     Documentation/devicetree/bindings/regulator/slg51000.txt
@@ -9252,7 +9254,7 @@ HMM - Heterogeneous Memory Management
 M:     Jérôme Glisse <jglisse@redhat.com>
 L:     linux-mm@kvack.org
 S:     Maintained
-F:     Documentation/vm/hmm.rst
+F:     Documentation/mm/hmm.rst
 F:     include/linux/hmm*
 F:     lib/test_hmm*
 F:     mm/hmm*
@@ -9350,8 +9352,8 @@ L:        linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-kernel-mm-hugepages
 F:     Documentation/admin-guide/mm/hugetlbpage.rst
-F:     Documentation/vm/hugetlbfs_reserv.rst
-F:     Documentation/vm/vmemmap_dedup.rst
+F:     Documentation/mm/hugetlbfs_reserv.rst
+F:     Documentation/mm/vmemmap_dedup.rst
 F:     fs/hugetlbfs/
 F:     include/linux/hugetlb.h
 F:     mm/hugetlb.c
@@ -10231,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
@@ -10387,7 +10388,7 @@ F:      drivers/gpio/gpio-*cove.c
 
 INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
 M:     Andy Shevchenko <andy@kernel.org>
-S:     Maintained
+S:     Supported
 F:     drivers/mfd/intel_soc_pmic*
 F:     include/linux/mfd/intel_soc_pmic*
 
@@ -10603,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
@@ -12400,7 +12412,6 @@ F:      Documentation/devicetree/bindings/*/maxim,max77686.yaml
 F:     Documentation/devicetree/bindings/*/maxim,max77693.yaml
 F:     Documentation/devicetree/bindings/*/maxim,max77843.yaml
 F:     Documentation/devicetree/bindings/clock/maxim,max77686.txt
-F:     Documentation/devicetree/bindings/mfd/max77693.txt
 F:     drivers/*/*max77843.c
 F:     drivers/*/max14577*.c
 F:     drivers/*/max77686*.c
@@ -13871,7 +13882,7 @@ F:      Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
 F:     drivers/media/i2c/mt9v111.c
 
 MULTIFUNCTION DEVICES (MFD)
-M:     Lee Jones <lee.jones@linaro.org>
+M:     Lee Jones <lee@kernel.org>
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 F:     Documentation/devicetree/bindings/mfd/
@@ -15338,7 +15349,7 @@ M:      Pasha Tatashin <pasha.tatashin@soleen.com>
 M:     Andrew Morton <akpm@linux-foundation.org>
 L:     linux-mm@kvack.org
 S:     Maintained
-F:     Documentation/vm/page_table_check.rst
+F:     Documentation/mm/page_table_check.rst
 F:     include/linux/page_table_check.h
 F:     mm/page_table_check.c
 
@@ -16579,6 +16590,9 @@ M:      Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 M:     Banajit Goswami <bgoswami@quicinc.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
+F:     include/dt-bindings/sound/qcom,wcd9335.h
+F:     sound/soc/codecs/lpass-rx-macro.*
+F:     sound/soc/codecs/lpass-tx-macro.*
 F:     sound/soc/codecs/lpass-va-macro.c
 F:     sound/soc/codecs/lpass-wsa-macro.*
 F:     sound/soc/codecs/msm8916-wcd-analog.c
@@ -16586,7 +16600,9 @@ F:      sound/soc/codecs/msm8916-wcd-digital.c
 F:     sound/soc/codecs/wcd9335.*
 F:     sound/soc/codecs/wcd934x.c
 F:     sound/soc/codecs/wcd-clsh-v2.*
+F:     sound/soc/codecs/wcd-mbhc-v2.*
 F:     sound/soc/codecs/wsa881x.c
+F:     sound/soc/codecs/wsa883x.c
 F:     sound/soc/qcom/
 
 QCOM EMBEDDED USB DEBUGGER (EUD)
@@ -19130,7 +19146,7 @@ F:      drivers/pinctrl/spear/
 
 SPI NOR SUBSYSTEM
 M:     Tudor Ambarus <tudor.ambarus@microchip.com>
-M:     Pratyush Yadav <p.yadav@ti.com>
+M:     Pratyush Yadav <pratyush@kernel.org>
 R:     Michael Walle <michael@walle.cc>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
@@ -19683,7 +19699,7 @@ S:      Maintained
 F:     drivers/mmc/host/sdhci-pci-dwc-mshc.c
 
 SYSTEM CONFIGURATION (SYSCON)
-M:     Lee Jones <lee.jones@linaro.org>
+M:     Lee Jones <lee@kernel.org>
 M:     Arnd Bergmann <arnd@arndb.de>
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
@@ -22480,7 +22496,7 @@ M:      Nitin Gupta <ngupta@vflare.org>
 R:     Sergey Senozhatsky <senozhatsky@chromium.org>
 L:     linux-mm@kvack.org
 S:     Maintained
-F:     Documentation/vm/zsmalloc.rst
+F:     Documentation/mm/zsmalloc.rst
 F:     include/linux/zsmalloc.h
 F:     mm/zsmalloc.c