Merge tag 'riscv-for-linus-6.5-mw1' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git] / MAINTAINERS
index 0d6ecb5a410788deb3efd610ee22d04d0459af61..1545c55b9173112aa1fa571f13351b18914adeb2 100644 (file)
@@ -273,8 +273,8 @@ ABI/API
 L:     linux-api@vger.kernel.org
 F:     include/linux/syscalls.h
 F:     kernel/sys_ni.c
-X:     include/uapi/
 X:     arch/*/include/uapi/
+X:     include/uapi/
 
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
@@ -406,12 +406,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/acpi/arm64
 
-ACPI SERIAL MULTI INSTANTIATE DRIVER
-M:     Hans de Goede <hdegoede@redhat.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/serial-multi-instantiate.c
-
 ACPI FOR RISC-V (ACPI/riscv)
 M:     Sunil V L <sunilvl@ventanamicro.com>
 L:     linux-acpi@vger.kernel.org
@@ -437,6 +431,12 @@ B: https://bugzilla.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 F:     drivers/acpi/pmic/
 
+ACPI SERIAL MULTI INSTANTIATE DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/serial-multi-instantiate.c
+
 ACPI THERMAL DRIVER
 M:     Rafael J. Wysocki <rafael@kernel.org>
 R:     Zhang Rui <rui.zhang@intel.com>
@@ -830,6 +830,13 @@ L: linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/allwinner/
 
+ALLWINNER DMIC DRIVERS
+M:     Ban Tao <fengzheng923@gmail.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
+F:     sound/soc/sunxi/sun50i-dmic.c
+
 ALLWINNER HARDWARE SPINLOCK SUPPORT
 M:     Wilken Gottwalt <wilken.gottwalt@posteo.net>
 S:     Maintained
@@ -851,13 +858,6 @@ L: linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/media/sunxi/cedrus/
 
-ALLWINNER DMIC DRIVERS
-M:     Ban Tao <fengzheng923@gmail.com>
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
-F:     sound/soc/sunxi/sun50i-dmic.c
-
 ALPHA PORT
 M:     Richard Henderson <richard.henderson@linaro.org>
 M:     Ivan Kokshaysky <ink@jurassic.park.msu.ru>
@@ -916,13 +916,6 @@ L: netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/altera/
 
-ALTERA TSE PCS
-M:     Maxime Chevallier <maxime.chevallier@bootlin.com>
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     drivers/net/pcs/pcs-altera-tse.c
-F:     include/linux/pcs-altera-tse.h
-
 ALTERA UART/JTAG UART SERIAL DRIVERS
 M:     Tobias Klauser <tklauser@distanz.ch>
 L:     linux-serial@vger.kernel.org
@@ -963,7 +956,8 @@ F:  Documentation/networking/device_drivers/ethernet/amazon/ena.rst
 F:     drivers/net/ethernet/amazon/
 
 AMAZON RDMA EFA DRIVER
-M:     Gal Pressman <galpress@amazon.com>
+M:     Michael Margolin <mrgolin@amazon.com>
+R:     Gal Pressman <gal.pressman@linux.dev>
 R:     Yossi Leybovich <sleybo@amazon.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
@@ -1033,6 +1027,16 @@ F:       drivers/char/hw_random/geode-rng.c
 F:     drivers/crypto/geode*
 F:     drivers/video/fbdev/geode/
 
+AMD HSMP DRIVER
+M:     Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
+R:     Carlos Bilbao <carlos.bilbao@amd.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     Documentation/arch/x86/amd_hsmp.rst
+F:     arch/x86/include/asm/amd_hsmp.h
+F:     arch/x86/include/uapi/asm/amd_hsmp.h
+F:     drivers/platform/x86/amd/hsmp.c
+
 AMD IOMMU (AMD-VI)
 M:     Joerg Roedel <joro@8bytes.org>
 R:     Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
@@ -1056,6 +1060,13 @@ F:       drivers/gpu/drm/amd/include/vi_structs.h
 F:     include/uapi/linux/kfd_ioctl.h
 F:     include/uapi/linux/kfd_sysfs.h
 
+AMD MP2 I2C DRIVER
+M:     Elie Morisse <syniurge@gmail.com>
+M:     Shyam Sundar S K <shyam-sundar.s-k@amd.com>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/i2c/busses/i2c-amd-mp2*
+
 AMD PDS CORE DRIVER
 M:     Shannon Nelson <shannon.nelson@amd.com>
 M:     Brett Creeley <brett.creeley@amd.com>
@@ -1065,18 +1076,6 @@ F:       Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
 F:     drivers/net/ethernet/amd/pds_core/
 F:     include/linux/pds/
 
-AMD SPI DRIVER
-M:     Sanjay R Mehta <sanju.mehta@amd.com>
-S:     Maintained
-F:     drivers/spi/spi-amd.c
-
-AMD MP2 I2C DRIVER
-M:     Elie Morisse <syniurge@gmail.com>
-M:     Shyam Sundar S K <shyam-sundar.s-k@amd.com>
-L:     linux-i2c@vger.kernel.org
-S:     Maintained
-F:     drivers/i2c/busses/i2c-amd-mp2*
-
 AMD PMC DRIVER
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -1090,16 +1089,6 @@ S:       Maintained
 F:     Documentation/ABI/testing/sysfs-amd-pmf
 F:     drivers/platform/x86/amd/pmf/
 
-AMD HSMP DRIVER
-M:     Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
-R:     Carlos Bilbao <carlos.bilbao@amd.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     Documentation/arch/x86/amd_hsmp.rst
-F:     arch/x86/include/asm/amd_hsmp.h
-F:     arch/x86/include/uapi/asm/amd_hsmp.h
-F:     drivers/platform/x86/amd/hsmp.c
-
 AMD POWERPLAY AND SWSMU
 M:     Evan Quan <evan.quan@amd.com>
 L:     amd-gfx@lists.freedesktop.org
@@ -1128,13 +1117,6 @@ M:       Tom Lendacky <thomas.lendacky@amd.com>
 S:     Supported
 F:     arch/arm64/boot/dts/amd/
 
-AMD XGBE DRIVER
-M:     "Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
-F:     drivers/net/ethernet/amd/xgbe/
-
 AMD SENSOR FUSION HUB DRIVER
 M:     Basavaraj Natikar <basavaraj.natikar@amd.com>
 L:     linux-input@vger.kernel.org
@@ -1142,6 +1124,18 @@ S:       Maintained
 F:     Documentation/hid/amd-sfh*
 F:     drivers/hid/amd-sfh-hid/
 
+AMD SPI DRIVER
+M:     Sanjay R Mehta <sanju.mehta@amd.com>
+S:     Maintained
+F:     drivers/spi/spi-amd.c
+
+AMD XGBE DRIVER
+M:     "Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
+F:     drivers/net/ethernet/amd/xgbe/
+
 AMLOGIC DDR PMU DRIVER
 M:     Jiucheng Xu <jiucheng.xu@amlogic.com>
 L:     linux-amlogic@lists.infradead.org
@@ -1176,6 +1170,14 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 F:     drivers/net/amt.c
 
+ANALOG DEVICES INC AD3552R DRIVER
+M:     Nuno Sá <nuno.sa@analog.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     https://ez.analog.com/linux-software-drivers
+F:     Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
+F:     drivers/iio/dac/ad3552r.c
+
 ANALOG DEVICES INC AD4130 DRIVER
 M:     Cosmin Tanislav <cosmin.tanislav@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1201,14 +1203,6 @@ W:       https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
 F:     drivers/iio/adc/ad7292.c
 
-ANALOG DEVICES INC AD3552R DRIVER
-M:     Nuno Sá <nuno.sa@analog.com>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
-F:     drivers/iio/dac/ad3552r.c
-
 ANALOG DEVICES INC AD7293 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1217,23 +1211,6 @@ W:       https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/dac/adi,ad7293.yaml
 F:     drivers/iio/dac/ad7293.c
 
-ANALOG DEVICES INC AD7768-1 DRIVER
-M:     Michael Hennerich <Michael.Hennerich@analog.com>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
-F:     drivers/iio/adc/ad7768-1.c
-
-ANALOG DEVICES INC AD7780 DRIVER
-M:     Michael Hennerich <Michael.Hennerich@analog.com>
-M:     Renato Lui Geh <renatogeh@gmail.com>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
-F:     drivers/iio/adc/ad7780.c
-
 ANALOG DEVICES INC AD74115 DRIVER
 M:     Cosmin Tanislav <cosmin.tanislav@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1251,6 +1228,23 @@ F:       Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml
 F:     drivers/iio/addac/ad74413r.c
 F:     include/dt-bindings/iio/addac/adi,ad74413r.h
 
+ANALOG DEVICES INC AD7768-1 DRIVER
+M:     Michael Hennerich <Michael.Hennerich@analog.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     https://ez.analog.com/linux-software-drivers
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
+F:     drivers/iio/adc/ad7768-1.c
+
+ANALOG DEVICES INC AD7780 DRIVER
+M:     Michael Hennerich <Michael.Hennerich@analog.com>
+M:     Renato Lui Geh <renatogeh@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     https://ez.analog.com/linux-software-drivers
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
+F:     drivers/iio/adc/ad7780.c
+
 ANALOG DEVICES INC ADA4250 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1301,10 +1295,10 @@ F:      drivers/iio/imu/adis16460.c
 ANALOG DEVICES INC ADIS16475 DRIVER
 M:     Nuno Sa <nuno.sa@analog.com>
 L:     linux-iio@vger.kernel.org
-W:     https://ez.analog.com/linux-software-drivers
 S:     Supported
-F:     drivers/iio/imu/adis16475.c
+W:     https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
+F:     drivers/iio/imu/adis16475.c
 
 ANALOG DEVICES INC ADM1177 DRIVER
 M:     Michael Hennerich <Michael.Hennerich@analog.com>
@@ -1322,21 +1316,21 @@ W:      https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/frequency/adi,admv1013.yaml
 F:     drivers/iio/frequency/admv1013.c
 
-ANALOG DEVICES INC ADMV8818 DRIVER
+ANALOG DEVICES INC ADMV1014 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
 W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml
-F:     drivers/iio/filter/admv8818.c
+F:     Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml
+F:     drivers/iio/frequency/admv1014.c
 
-ANALOG DEVICES INC ADMV1014 DRIVER
+ANALOG DEVICES INC ADMV8818 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
 W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml
-F:     drivers/iio/frequency/admv1014.c
+F:     Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml
+F:     drivers/iio/filter/admv8818.c
 
 ANALOG DEVICES INC ADP5061 DRIVER
 M:     Michael Hennerich <Michael.Hennerich@analog.com>
@@ -1358,8 +1352,8 @@ M:        Lars-Peter Clausen <lars@metafoo.de>
 L:     linux-media@vger.kernel.org
 S:     Supported
 W:     https://ez.analog.com/linux-software-drivers
-F:     drivers/media/i2c/adv7180.c
 F:     Documentation/devicetree/bindings/media/i2c/adv7180.yaml
+F:     drivers/media/i2c/adv7180.c
 
 ANALOG DEVICES INC ADV748X DRIVER
 M:     Kieran Bingham <kieran.bingham@ideasonboard.com>
@@ -1378,8 +1372,8 @@ ANALOG DEVICES INC ADV7604 DRIVER
 M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/media/i2c/adv7604*
 F:     Documentation/devicetree/bindings/media/i2c/adv7604.yaml
+F:     drivers/media/i2c/adv7604*
 
 ANALOG DEVICES INC ADV7842 DRIVER
 M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
@@ -1391,8 +1385,8 @@ ANALOG DEVICES INC ADXRS290 DRIVER
 M:     Nishant Malpani <nish.malpani25@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
-F:     drivers/iio/gyro/adxrs290.c
 F:     Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
+F:     drivers/iio/gyro/adxrs290.c
 
 ANALOG DEVICES INC ASOC CODEC DRIVERS
 M:     Lars-Peter Clausen <lars@metafoo.de>
@@ -1607,7 +1601,7 @@ F:        drivers/media/i2c/ar0521.c
 
 ARASAN NAND CONTROLLER DRIVER
 M:     Miquel Raynal <miquel.raynal@bootlin.com>
-M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
+R:     Michal Simek <michal.simek@amd.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml
@@ -1632,6 +1626,18 @@ S:       Maintained
 F:     drivers/net/arcnet/
 F:     include/uapi/linux/if_arcnet.h
 
+ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
+M:     Arnd Bergmann <arnd@arndb.de>
+M:     Olof Johansson <olof@lixom.net>
+M:     soc@kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+C:     irc://irc.libera.chat/armlinux
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
+F:     Documentation/process/maintainer-soc.rst
+F:     arch/arm/boot/dts/Makefile
+F:     arch/arm64/boot/dts/Makefile
+
 ARM ARCHITECTED TIMER DRIVER
 M:     Mark Rutland <mark.rutland@arm.com>
 M:     Marc Zyngier <maz@kernel.org>
@@ -1660,9 +1666,9 @@ F:        Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
 F:     Documentation/devicetree/bindings/i2c/arm,i2c-versatile.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
 F:     Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
-F:     arch/arm/boot/dts/arm-realview-*
-F:     arch/arm/boot/dts/integrator*
-F:     arch/arm/boot/dts/versatile*
+F:     arch/arm/boot/dts/arm/arm-realview-*
+F:     arch/arm/boot/dts/arm/integrator*
+F:     arch/arm/boot/dts/arm/versatile*
 F:     arch/arm/mach-versatile/
 F:     drivers/bus/arm-integrator-lm.c
 F:     drivers/clk/versatile/
@@ -1673,10 +1679,7 @@ F:       drivers/power/reset/arm-versatile-reboot.c
 F:     drivers/soc/versatile/
 
 ARM KOMEDA DRM-KMS DRIVER
-M:     James (Qian) Wang <james.qian.wang@arm.com>
 M:     Liviu Dudau <liviu.dudau@arm.com>
-M:     Mihail Atanassov <mihail.atanassov@arm.com>
-L:     Mali DP Maintainers <malidp@foss.arm.com>
 S:     Supported
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/arm,komeda.yaml
@@ -1697,8 +1700,6 @@ F:        include/uapi/drm/panfrost_drm.h
 
 ARM MALI-DP DRM DRIVER
 M:     Liviu Dudau <liviu.dudau@arm.com>
-M:     Brian Starkey <brian.starkey@arm.com>
-L:     Mali DP Maintainers <malidp@foss.arm.com>
 S:     Supported
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/arm,malidp.yaml
@@ -1745,22 +1746,6 @@ S:       Odd Fixes
 F:     drivers/amba/
 F:     include/linux/amba/bus.h
 
-ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com>
-M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
-L:     linux-mtd@lists.infradead.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
-F:     drivers/mtd/nand/raw/pl35x-nand-controller.c
-
-ARM PRIMECELL PL35X SMC DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com>
-M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
-F:     drivers/memory/pl353-smc.c
-
 ARM PRIMECELL CLCD PL110 DRIVER
 M:     Russell King <linux@armlinux.org.uk>
 S:     Odd Fixes
@@ -1778,6 +1763,22 @@ S:       Odd Fixes
 F:     drivers/mmc/host/mmci.*
 F:     include/linux/amba/mmci.h
 
+ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+R:     Michal Simek <michal.simek@amd.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
+F:     drivers/mtd/nand/raw/pl35x-nand-controller.c
+
+ARM PRIMECELL PL35X SMC DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+R:     Michal Simek <michal.simek@amd.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
+F:     drivers/memory/pl353-smc.c
+
 ARM PRIMECELL SSP PL022 SPI DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1814,17 +1815,6 @@ F:       Documentation/devicetree/bindings/iommu/arm,smmu*
 F:     drivers/iommu/arm/
 F:     drivers/iommu/io-pgtable-arm*
 
-ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
-M:     Arnd Bergmann <arnd@arndb.de>
-M:     Olof Johansson <olof@lixom.net>
-M:     soc@kernel.org
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-C:     irc://irc.libera.chat/armlinux
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
-F:     arch/arm/boot/dts/Makefile
-F:     arch/arm64/boot/dts/Makefile
-
 ARM SUB-ARCHITECTURES
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -1849,7 +1839,7 @@ F:        Documentation/devicetree/bindings/net/actions,owl-emac.yaml
 F:     Documentation/devicetree/bindings/pinctrl/actions,*
 F:     Documentation/devicetree/bindings/power/actions,owl-sps.txt
 F:     Documentation/devicetree/bindings/timer/actions,owl-timer.txt
-F:     arch/arm/boot/dts/owl-*
+F:     arch/arm/boot/dts/actions/
 F:     arch/arm/mach-actions/
 F:     arch/arm64/boot/dts/actions/
 F:     drivers/clk/actions/
@@ -1876,9 +1866,9 @@ M:        Chen-Yu Tsai <wens@csie.org>
 M:     Jernej Skrabec <jernej.skrabec@gmail.com>
 M:     Samuel Holland <samuel@sholland.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-sunxi@lists.linux.dev
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
-L:     linux-sunxi@lists.linux.dev
 F:     arch/arm/mach-sunxi/
 F:     arch/arm64/boot/dts/allwinner/
 F:     drivers/clk/sunxi-ng/
@@ -1895,6 +1885,7 @@ L:        linux-amlogic@lists.infradead.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/amlogic*
 F:     drivers/clk/meson/
+F:     include/dt-bindings/clock/amlogic,a1*
 F:     include/dt-bindings/clock/gxbb*
 F:     include/dt-bindings/clock/meson*
 
@@ -1922,10 +1913,12 @@ L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-amlogic@lists.infradead.org
 S:     Maintained
 W:     http://linux-meson.com/
-F:     arch/arm/boot/dts/meson*
+F:     Documentation/devicetree/bindings/phy/amlogic*
+F:     arch/arm/boot/dts/amlogic/
 F:     arch/arm/mach-meson/
 F:     arch/arm64/boot/dts/amlogic/
 F:     drivers/mmc/host/meson*
+F:     drivers/phy/amlogic/
 F:     drivers/pinctrl/meson/
 F:     drivers/rtc/rtc-meson*
 F:     drivers/soc/amlogic/
@@ -1936,11 +1929,20 @@ M:      Tsahee Zidenberg <tsahee@annapurnalabs.com>
 M:     Antoine Tenart <atenart@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/alpine*
+F:     arch/arm/boot/dts/amazon/
 F:     arch/arm/mach-alpine/
 F:     arch/arm64/boot/dts/amazon/
 F:     drivers/*/*alpine*
 
+ARM/APPLE MACHINE SOUND DRIVERS
+M:     Martin Povišer <povik+lin@cutebit.org>
+L:     asahi@lists.linux.dev
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/apple,*
+F:     sound/soc/apple/*
+F:     sound/soc/codecs/cs42l83-i2c.c
+
 ARM/APPLE MACHINE SUPPORT
 M:     Hector Martin <marcan@marcan.st>
 M:     Sven Peter <sven@svenpeter.dev>
@@ -1968,7 +1970,7 @@ F:        Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
 F:     Documentation/devicetree/bindings/pci/apple,pcie.yaml
 F:     Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
 F:     Documentation/devicetree/bindings/power/apple*
-F:     Documentation/devicetree/bindings/pwm/pwm-apple.yaml
+F:     Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
 F:     Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
 F:     arch/arm64/boot/dts/apple/
 F:     drivers/bluetooth/hci_bcm4377.c
@@ -1992,22 +1994,13 @@ F:      include/dt-bindings/pinctrl/apple.h
 F:     include/linux/apple-mailbox.h
 F:     include/linux/soc/apple/*
 
-ARM/APPLE MACHINE SOUND DRIVERS
-M:     Martin Povišer <povik+lin@cutebit.org>
-L:     asahi@lists.linux.dev
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/sound/apple,*
-F:     sound/soc/apple/*
-F:     sound/soc/codecs/cs42l83-i2c.c
-
 ARM/ARTPEC MACHINE SUPPORT
 M:     Jesper Nilsson <jesper.nilsson@axis.com>
 M:     Lars Persson <lars.persson@axis.com>
 L:     linux-arm-kernel@axis.com
 S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
-F:     arch/arm/boot/dts/artpec6*
+F:     arch/arm/boot/dts/axis/
 F:     arch/arm/mach-artpec
 F:     drivers/clk/axis
 F:     drivers/crypto/axis
@@ -2035,7 +2028,7 @@ S:        Supported
 Q:     https://patchwork.ozlabs.org/project/linux-aspeed/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 F:     Documentation/devicetree/bindings/arm/aspeed/
-F:     arch/arm/boot/dts/aspeed-*
+F:     arch/arm/boot/dts/aspeed/
 F:     arch/arm/mach-aspeed/
 N:     aspeed
 
@@ -2054,8 +2047,7 @@ ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Andre Przywara <andre.przywara@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/ecx-*.dts*
-F:     arch/arm/boot/dts/highbank.dts
+F:     arch/arm/boot/dts/calxeda/
 F:     arch/arm/mach-highbank/
 
 ARM/CAVIUM THUNDER NETWORK DRIVER
@@ -2103,7 +2095,7 @@ ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
 M:     Baruch Siach <baruch@tkos.co.il>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/cx92755*
+F:     arch/arm/boot/dts/cnxt/
 N:     digicolor
 
 ARM/CORESIGHT FRAMEWORK AND DRIVERS
@@ -2116,19 +2108,19 @@ S:      Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
 F:     Documentation/ABI/testing/sysfs-bus-coresight-devices-*
 F:     Documentation/devicetree/bindings/arm/arm,coresight-*.yaml
-F:     Documentation/devicetree/bindings/arm/qcom,coresight-*.yaml
 F:     Documentation/devicetree/bindings/arm/arm,embedded-trace-extension.yaml
 F:     Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml
+F:     Documentation/devicetree/bindings/arm/qcom,coresight-*.yaml
 F:     Documentation/trace/coresight/*
 F:     drivers/hwtracing/coresight/*
 F:     include/dt-bindings/arm/coresight-cti-dt.h
 F:     include/linux/coresight*
 F:     samples/coresight/*
-F:     tools/perf/tests/shell/coresight/*
 F:     tools/perf/arch/arm/util/auxtrace.c
 F:     tools/perf/arch/arm/util/cs-etm.c
 F:     tools/perf/arch/arm/util/cs-etm.h
 F:     tools/perf/arch/arm/util/pmu.c
+F:     tools/perf/tests/shell/coresight/*
 F:     tools/perf/util/cs-etm-decoder/*
 F:     tools/perf/util/cs-etm.*
 
@@ -2142,7 +2134,7 @@ F:        Documentation/devicetree/bindings/arm/gemini.yaml
 F:     Documentation/devicetree/bindings/net/cortina,gemini-ethernet.yaml
 F:     Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 F:     Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
-F:     arch/arm/boot/dts/gemini*
+F:     arch/arm/boot/dts/gemini/
 F:     arch/arm/mach-gemini/
 F:     drivers/crypto/gemini/
 F:     drivers/net/ethernet/cortina/
@@ -2163,9 +2155,9 @@ F:        Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
 F:     Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
 F:     drivers/bus/moxtet.c
 F:     drivers/firmware/turris-mox-rwtm.c
+F:     drivers/gpio/gpio-moxtet.c
 F:     drivers/leds/leds-turris-omnia.c
 F:     drivers/mailbox/armada-37xx-rwtm-mailbox.c
-F:     drivers/gpio/gpio-moxtet.c
 F:     drivers/watchdog/armada_37xx_wdt.c
 F:     include/dt-bindings/bus/moxtet.h
 F:     include/linux/armada-37xx-rwtm-mailbox.h
@@ -2195,10 +2187,11 @@ R:      NXP Linux Team <linux-imx@nxp.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
-X:     drivers/media/i2c/
-F:     arch/arm64/boot/dts/freescale/
+F:     arch/arm/boot/dts/nxp/imx/
+F:     arch/arm/boot/dts/nxp/mxs/
 X:     arch/arm64/boot/dts/freescale/fsl-*
 X:     arch/arm64/boot/dts/freescale/qoriq-*
+X:     drivers/media/i2c/
 N:     imx
 N:     mxs
 
@@ -2208,7 +2201,7 @@ M:        Li Yang <leoyang.li@nxp.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
-F:     arch/arm/boot/dts/ls1021a*
+F:     arch/arm/boot/dts/nxp/ls/
 F:     arch/arm64/boot/dts/freescale/fsl-*
 F:     arch/arm64/boot/dts/freescale/qoriq-*
 
@@ -2220,7 +2213,7 @@ R:        Stefan Agner <stefan@agner.ch>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
-F:     arch/arm/boot/dts/vf*
+F:     arch/arm/boot/dts/nxp/vf/
 F:     arch/arm/mach-imx/*vf610*
 
 ARM/GUMSTIX MACHINE SUPPORT
@@ -2234,9 +2227,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 W:     http://www.hisilicon.com
 T:     git https://github.com/hisilicon/linux-hisi.git
-F:     arch/arm/boot/dts/hi3*
-F:     arch/arm/boot/dts/hip*
-F:     arch/arm/boot/dts/hisi*
+F:     arch/arm/boot/dts/hisilicon/
 F:     arch/arm/mach-hisi/
 F:     arch/arm64/boot/dts/hisilicon/
 
@@ -2252,14 +2243,13 @@ ARM/HPE GXP ARCHITECTURE
 M:     Jean-Marie Verdun <verdun@hpe.com>
 M:     Nick Hawkins <nick.hawkins@hpe.com>
 S:     Maintained
-F:     Documentation/hwmon/gxp-fan-ctrl.rst
 F:     Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 F:     Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml
 F:     Documentation/devicetree/bindings/i2c/hpe,gxp-i2c.yaml
 F:     Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
 F:     Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
-F:     arch/arm/boot/dts/hpe-bmc*
-F:     arch/arm/boot/dts/hpe-gxp*
+F:     Documentation/hwmon/gxp-fan-ctrl.rst
+F:     arch/arm/boot/dts/hpe/
 F:     arch/arm/mach-hpe/
 F:     drivers/clocksource/timer-gxp.c
 F:     drivers/hwmon/gxp-fan-ctrl.c
@@ -2273,7 +2263,7 @@ M:        Javier Martinez Canillas <javier@dowhile0.org>
 L:     linux-omap@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/omap3-igep*
+F:     arch/arm/boot/dts/ti/omap/omap3-igep*
 
 ARM/INTEL IXP4XX ARM ARCHITECTURE
 M:     Linus Walleij <linusw@kernel.org>
@@ -2282,11 +2272,11 @@ M:      Krzysztof Halasa <khalasa@piap.pl>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
-F:     Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 F:     Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 F:     Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
+F:     Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 F:     Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
-F:     arch/arm/boot/dts/intel-ixp*
+F:     arch/arm/boot/dts/intel/ixp/
 F:     arch/arm/mach-ixp4xx/
 F:     drivers/bus/intel-ixp4xx-eb.c
 F:     drivers/clocksource/timer-ixp4xx.c
@@ -2318,7 +2308,7 @@ M:        Vladimir Zapolskiy <vz@mleia.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
-F:     arch/arm/boot/dts/lpc43*
+F:     arch/arm/boot/dts/nxp/lpc/lpc43*
 F:     drivers/i2c/busses/i2c-lpc2k.c
 F:     drivers/memory/pl172.c
 F:     drivers/mtd/spi-nor/controllers/nxp-spifi.c
@@ -2331,7 +2321,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://github.com/vzapolskiy/linux-lpc32xx.git
 F:     Documentation/devicetree/bindings/i2c/i2c-pnx.txt
-F:     arch/arm/boot/dts/lpc32*
+F:     arch/arm/boot/dts/nxp/lpc/lpc32*
 F:     arch/arm/mach-lpc32xx/
 F:     drivers/i2c/busses/i2c-pnx.c
 F:     drivers/net/ethernet/nxp/lpc_eth.c
@@ -2349,8 +2339,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
 F:     Documentation/devicetree/bindings/arm/marvell/marvell,dove.txt
 F:     Documentation/devicetree/bindings/arm/marvell/marvell,orion5x.txt
 F:     Documentation/devicetree/bindings/soc/dove/
-F:     arch/arm/boot/dts/dove*
-F:     arch/arm/boot/dts/orion5x*
+F:     arch/arm/boot/dts/marvell/dove*
+F:     arch/arm/boot/dts/marvell/orion5x*
 F:     arch/arm/mach-dove/
 F:     arch/arm/mach-mv78xx0/
 F:     arch/arm/mach-orion5x/
@@ -2365,12 +2355,13 @@ L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
 F:     Documentation/devicetree/bindings/arm/marvell/
-F:     arch/arm/boot/dts/armada*
-F:     arch/arm/boot/dts/kirkwood*
+F:     arch/arm/boot/dts/marvell/armada*
+F:     arch/arm/boot/dts/marvell/kirkwood*
 F:     arch/arm/configs/mvebu_*_defconfig
 F:     arch/arm/mach-mvebu/
 F:     arch/arm64/boot/dts/marvell/armada*
 F:     arch/arm64/boot/dts/marvell/cn913*
+F:     drivers/clk/mvebu/
 F:     drivers/cpufreq/armada-37xx-cpufreq.c
 F:     drivers/cpufreq/armada-8k-cpufreq.c
 F:     drivers/cpufreq/mvebu-cpufreq.c
@@ -2400,10 +2391,7 @@ L:       linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     https://mtk.wiki.kernel.org/
 C:     irc://irc.libera.chat/linux-mediatek
-F:     arch/arm/boot/dts/mt2*
-F:     arch/arm/boot/dts/mt6*
-F:     arch/arm/boot/dts/mt7*
-F:     arch/arm/boot/dts/mt8*
+F:     arch/arm/boot/dts/mediatek/
 F:     arch/arm/mach-mediatek/
 F:     arch/arm64/boot/dts/mediatek/
 F:     drivers/soc/mediatek/
@@ -2427,10 +2415,8 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 W:     http://www.linux4sam.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
-F:     arch/arm/boot/dts/at91*.dts
-F:     arch/arm/boot/dts/at91*.dtsi
-F:     arch/arm/boot/dts/sama*.dts
-F:     arch/arm/boot/dts/sama*.dtsi
+F:     arch/arm/boot/dts/microchip/at91*
+F:     arch/arm/boot/dts/microchip/sama*
 F:     arch/arm/include/debug/at91.S
 F:     arch/arm/mach-at91/
 F:     drivers/memory/atmel*
@@ -2441,6 +2427,15 @@ X:       drivers/net/wireless/atmel/
 N:     at91
 N:     atmel
 
+ARM/MICROCHIP (ARM64) SoC support
+M:     Conor Dooley <conor@kernel.org>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
+M:     Claudiu Beznea <claudiu.beznea@microchip.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Supported
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
+F:     arch/arm64/boot/dts/microchip/
+
 ARM/Microchip Sparx5 SoC support
 M:     Lars Povlsen <lars.povlsen@microchip.com>
 M:     Steen Hegelund <Steen.Hegelund@microchip.com>
@@ -2448,25 +2443,17 @@ M:      Daniel Machon <daniel.machon@microchip.com>
 M:     UNGLinuxDriver@microchip.com
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
-T:     git git://github.com/microchip-ung/linux-upstream.git
-F:     arch/arm64/boot/dts/microchip/
+F:     arch/arm64/boot/dts/microchip/sparx*
 F:     drivers/net/ethernet/microchip/vcap/
 F:     drivers/pinctrl/pinctrl-microchip-sgpio.c
 N:     sparx5
 
-Microchip Timer Counter Block (TCB) Capture Driver
-M:     Kamel Bouhara <kamel.bouhara@bootlin.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     linux-iio@vger.kernel.org
-S:     Maintained
-F:     drivers/counter/microchip-tcb-capture.c
-
 ARM/MILBEAUT ARCHITECTURE
 M:     Taichi Sugaya <sugaya.taichi@socionext.com>
 M:     Takao Orito <orito.takao@socionext.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/milbeaut*
+F:     arch/arm/boot/dts/socionext/milbeaut*
 F:     arch/arm/mach-milbeaut/
 N:     milbeaut
 
@@ -2480,7 +2467,7 @@ T:        git git://github.com/linux-chenxing/linux.git
 F:     Documentation/devicetree/bindings/arm/mstar/*
 F:     Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml
 F:     Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
-F:     arch/arm/boot/dts/mstar-*
+F:     arch/arm/boot/dts/sigmastar/
 F:     arch/arm/mach-mstar/
 F:     drivers/clk/mstar/
 F:     drivers/clocksource/timer-msc313e.c
@@ -2499,7 +2486,7 @@ F:        Documentation/devicetree/bindings/arm/ste-*
 F:     Documentation/devicetree/bindings/arm/ux500.yaml
 F:     Documentation/devicetree/bindings/arm/ux500/
 F:     Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml
-F:     arch/arm/boot/dts/ste-*
+F:     arch/arm/boot/dts/st/ste-*
 F:     arch/arm/mach-nomadik/
 F:     arch/arm/mach-ux500/
 F:     drivers/clk/clk-nomadik.c
@@ -2516,6 +2503,18 @@ F:       drivers/rtc/rtc-ab8500.c
 F:     drivers/rtc/rtc-pl031.c
 F:     drivers/soc/ux500/
 
+ARM/NUVOTON MA35 ARCHITECTURE
+M:     Jacky Huang <ychuang3@nuvoton.com>
+M:     Shan-Chun Hung <schung@nuvoton.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Supported
+F:     Documentation/devicetree/bindings/*/*/*ma35*
+F:     Documentation/devicetree/bindings/*/*ma35*
+F:     arch/arm64/boot/dts/nuvoton/*ma35*
+F:     drivers/*/*/*ma35*
+F:     drivers/*/*ma35*
+K:     ma35d1
+
 ARM/NUVOTON NPCM ARCHITECTURE
 M:     Avi Fishman <avifishman70@gmail.com>
 M:     Tomer Maimon <tmaimon77@gmail.com>
@@ -2527,13 +2526,12 @@ L:      openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Supported
 F:     Documentation/devicetree/bindings/*/*/*npcm*
 F:     Documentation/devicetree/bindings/*/*npcm*
-F:     Documentation/devicetree/bindings/arm/npcm/*
 F:     Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
-F:     arch/arm/boot/dts/nuvoton-npcm*
+F:     arch/arm/boot/dts/nuvoton/nuvoton-npcm*
 F:     arch/arm/mach-npcm/
 F:     arch/arm64/boot/dts/nuvoton/
-F:     drivers/*/*npcm*
 F:     drivers/*/*/*npcm*
+F:     drivers/*/*npcm*
 F:     drivers/rtc/rtc-nct3018y.c
 F:     include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
 F:     include/dt-bindings/clock/nuvoton,npcm845-clk.h
@@ -2544,7 +2542,7 @@ L:        openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Maintained
 W:     https://github.com/neuschaefer/wpcm450/wiki
 F:     Documentation/devicetree/bindings/*/*wpcm*
-F:     arch/arm/boot/dts/nuvoton-wpcm450*
+F:     arch/arm/boot/dts/nuvoton/nuvoton-wpcm450*
 F:     arch/arm/configs/wpcm450_defconfig
 F:     arch/arm/mach-npcm/wpcm450.c
 F:     drivers/*/*/*wpcm*
@@ -2576,23 +2574,28 @@ F:      arch/arm/mach-oxnas/
 F:     drivers/power/reset/oxnas-restart.c
 N:     oxnas
 
+ARM/QUALCOMM CHROMEBOOK SUPPORT
+R:     cros-qcom-dts-watchers@chromium.org
+F:     arch/arm64/boot/dts/qcom/sc7180*
+F:     arch/arm64/boot/dts/qcom/sc7280*
+F:     arch/arm64/boot/dts/qcom/sdm845-cheza*
+
 ARM/QUALCOMM SUPPORT
 M:     Andy Gross <agross@kernel.org>
 M:     Bjorn Andersson <andersson@kernel.org>
-R:     Konrad Dybcio <konrad.dybcio@linaro.org>
+M:     Konrad Dybcio <konrad.dybcio@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
 F:     Documentation/devicetree/bindings/*/qcom*
 F:     Documentation/devicetree/bindings/soc/qcom/
-F:     arch/arm/boot/dts/qcom-*.dts
-F:     arch/arm/boot/dts/qcom-*.dtsi
+F:     arch/arm/boot/dts/qcom/
 F:     arch/arm/configs/qcom_defconfig
 F:     arch/arm/mach-qcom/
 F:     arch/arm64/boot/dts/qcom/
+F:     drivers/*/*/pm8???-*
 F:     drivers/*/*/qcom*
 F:     drivers/*/*/qcom/
-F:     drivers/*/pm8???-*
 F:     drivers/*/qcom*
 F:     drivers/*/qcom/
 F:     drivers/bluetooth/btqcomsmd.c
@@ -2609,22 +2612,16 @@ F:      drivers/pci/controller/dwc/pcie-qcom.c
 F:     drivers/phy/qualcomm/
 F:     drivers/power/*/msm*
 F:     drivers/reset/reset-qcom-*
-F:     drivers/ufs/host/ufs-qcom*
 F:     drivers/spi/spi-geni-qcom.c
 F:     drivers/spi/spi-qcom-qspi.c
 F:     drivers/spi/spi-qup.c
 F:     drivers/tty/serial/msm_serial.c
+F:     drivers/ufs/host/ufs-qcom*
 F:     drivers/usb/dwc3/dwc3-qcom.c
 F:     include/dt-bindings/*/qcom*
 F:     include/linux/*/qcom*
 F:     include/linux/soc/qcom/
 
-ARM/QUALCOMM CHROMEBOOK SUPPORT
-R:     cros-qcom-dts-watchers@chromium.org
-F:     arch/arm64/boot/dts/qcom/sc7180*
-F:     arch/arm64/boot/dts/qcom/sc7280*
-F:     arch/arm64/boot/dts/qcom/sdm845-cheza*
-
 ARM/RDA MICRO ARCHITECTURE
 M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2635,7 +2632,7 @@ F:        Documentation/devicetree/bindings/gpio/gpio-rda.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.yaml
 F:     Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
 F:     Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
-F:     arch/arm/boot/dts/rda8810pl-*
+F:     arch/arm/boot/dts/unisoc/
 F:     drivers/clocksource/timer-rda.c
 F:     drivers/gpio/gpio-rda.c
 F:     drivers/irqchip/irq-rda-intc.c
@@ -2647,7 +2644,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-realtek-soc@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/realtek.yaml
-F:     arch/arm/boot/dts/rtd*
+F:     arch/arm/boot/dts/realtek/
 F:     arch/arm/mach-realtek/
 F:     arch/arm64/boot/dts/realtek/
 
@@ -2661,13 +2658,7 @@ C:       irc://irc.libera.chat/renesas-soc
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 F:     Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
 F:     Documentation/devicetree/bindings/soc/renesas/
-F:     arch/arm/boot/dts/emev2*
-F:     arch/arm/boot/dts/gr-peach*
-F:     arch/arm/boot/dts/iwg20d-q7*
-F:     arch/arm/boot/dts/r7s*
-F:     arch/arm/boot/dts/r8a*
-F:     arch/arm/boot/dts/r9a*
-F:     arch/arm/boot/dts/sh*
+F:     arch/arm/boot/dts/renesas/
 F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
 F:     arch/arm/mach-shmobile/
@@ -2700,8 +2691,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
 F:     Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
 F:     Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
 F:     Documentation/devicetree/bindings/spi/spi-rockchip.yaml
-F:     arch/arm/boot/dts/rk3*
-F:     arch/arm/boot/dts/rv11*
+F:     arch/arm/boot/dts/rockchip/
 F:     arch/arm/mach-rockchip/
 F:     drivers/*/*/*rockchip*
 F:     drivers/*/*rockchip*
@@ -2716,18 +2706,16 @@ R:      Alim Akhtar <alim.akhtar@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/linux-exynos
 Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
 B:     mailto:linux-samsung-soc@vger.kernel.org
+C:     irc://irc.libera.chat/linux-exynos
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
-F:     Documentation/arm/samsung/
+F:     Documentation/arch/arm/samsung/
 F:     Documentation/devicetree/bindings/arm/samsung/
 F:     Documentation/devicetree/bindings/hwinfo/samsung,*
 F:     Documentation/devicetree/bindings/power/pd-samsung.yaml
 F:     Documentation/devicetree/bindings/soc/samsung/
-F:     arch/arm/boot/dts/exynos*
-F:     arch/arm/boot/dts/s3c*
-F:     arch/arm/boot/dts/s5p*
+F:     arch/arm/boot/dts/samsung/
 F:     arch/arm/mach-exynos*/
 F:     arch/arm/mach-s3c/
 F:     arch/arm/mach-s5p*/
@@ -2787,7 +2775,7 @@ M:        Dinh Nguyen <dinguyen@kernel.org>
 S:     Maintained
 W:     http://www.rocketboards.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
-F:     arch/arm/boot/dts/socfpga*
+F:     arch/arm/boot/dts/intel/socfpga/
 F:     arch/arm/configs/socfpga_defconfig
 F:     arch/arm/mach-socfpga/
 F:     arch/arm64/boot/dts/altera/
@@ -2818,9 +2806,9 @@ M:        Patrice Chotard <patrice.chotard@foss.st.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     http://www.stlinux.com
-F:     Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
 F:     Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml
-F:     arch/arm/boot/dts/sti*
+F:     Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
+F:     arch/arm/boot/dts/st/sti*
 F:     arch/arm/mach-sti/
 F:     drivers/ata/ahci_st.c
 F:     drivers/char/hw_random/st-rng.c
@@ -2853,9 +2841,10 @@ L:       linux-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
-F:     arch/arm/boot/dts/stm32*
+F:     arch/arm/boot/dts/st/stm32*
 F:     arch/arm/mach-stm32/
 F:     drivers/clocksource/armv7m_systick.c
+F:     arch/arm64/boot/dts/st/
 N:     stm32
 N:     stm
 
@@ -2868,7 +2857,7 @@ F:        Documentation/devicetree/bindings/arm/sunplus,sp7021.yaml
 F:     Documentation/devicetree/bindings/clock/sunplus,sp7021-clkc.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.yaml
 F:     Documentation/devicetree/bindings/reset/sunplus,reset.yaml
-F:     arch/arm/boot/dts/sunplus-sp7021*.dts*
+F:     arch/arm/boot/dts/sunplus/
 F:     arch/arm/configs/sp7021_*defconfig
 F:     arch/arm/mach-sunplus/
 F:     drivers/clk/clk-sp7021.c
@@ -2882,7 +2871,7 @@ M:        Jisheng Zhang <jszhang@kernel.org>
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/berlin*
+F:     arch/arm/boot/dts/synaptics/
 F:     arch/arm/mach-berlin/
 F:     arch/arm64/boot/dts/synaptics/
 
@@ -2924,7 +2913,7 @@ M:        Santosh Shilimkar <ssantosh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
-F:     arch/arm/boot/dts/keystone-*
+F:     arch/arm/boot/dts/ti/keystone/
 F:     arch/arm/mach-keystone/
 
 ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@ -2966,15 +2955,15 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
 F:     Documentation/devicetree/bindings/arm/toshiba.yaml
 F:     Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pipllct.yaml
 F:     Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pismu.yaml
-F:     Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
 F:     Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
+F:     Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
 F:     Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
 F:     Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
 F:     Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
 F:     arch/arm64/boot/dts/toshiba/
 F:     drivers/clk/visconti/
-F:     drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
 F:     drivers/gpio/gpio-visconti.c
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
 F:     drivers/pci/controller/dwc/pcie-visconti.c
 F:     drivers/pinctrl/visconti/
 F:     drivers/watchdog/visconti_wdt.c
@@ -2989,7 +2978,7 @@ F:        Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
 F:     Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
 F:     Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
 F:     Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml
-F:     arch/arm/boot/dts/uniphier*
+F:     arch/arm/boot/dts/socionext/uniphier*
 F:     arch/arm/include/asm/hardware/cache-uniphier.h
 F:     arch/arm/mach-uniphier/
 F:     arch/arm/mm/cache-uniphier.c
@@ -3014,7 +3003,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     */*/*/vexpress*
 F:     */*/vexpress*
-F:     arch/arm/boot/dts/vexpress*
+F:     arch/arm/boot/dts/arm/vexpress*
 F:     arch/arm/mach-versatile/
 F:     arch/arm64/boot/dts/arm/
 F:     drivers/clk/versatile/clk-vexpress-osc.c
@@ -3072,7 +3061,7 @@ M:        Will Deacon <will@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
-F:     Documentation/arm64/
+F:     Documentation/arch/arm64/
 F:     arch/arm64/
 F:     tools/testing/selftests/arm64/
 X:     arch/arm64/boot/dts/
@@ -3119,6 +3108,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/net/asix,ax88796c.yaml
 F:     drivers/net/ethernet/asix/ax88796c_*
 
+ASPEED CRYPTO DRIVER
+M:     Neal Liu <neal_liu@aspeedtech.com>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/crypto/aspeed,*
+F:     drivers/crypto/aspeed/
+
 ASPEED PECI CONTROLLER
 M:     Iwona Winiarska <iwona.winiarska@intel.com>
 L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
@@ -3163,6 +3159,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
 F:     drivers/spi/spi-aspeed-smc.c
 
+ASPEED USB UDC DRIVER
+M:     Neal Liu <neal_liu@aspeedtech.com>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
+F:     drivers/usb/gadget/udc/aspeed_udc.c
+
 ASPEED VIDEO ENGINE DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-media@vger.kernel.org
@@ -3171,19 +3174,11 @@ S:      Maintained
 F:     Documentation/devicetree/bindings/media/aspeed-video.txt
 F:     drivers/media/platform/aspeed/
 
-ASPEED USB UDC DRIVER
-M:     Neal Liu <neal_liu@aspeedtech.com>
-L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
-F:     drivers/usb/gadget/udc/aspeed_udc.c
-
-ASPEED CRYPTO DRIVER
-M:     Neal Liu <neal_liu@aspeedtech.com>
-L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+ASUS EC HARDWARE MONITOR DRIVER
+M:     Eugene Shalygin <eugene.shalygin@gmail.com>
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/crypto/aspeed,*
-F:     drivers/crypto/aspeed/
+F:     drivers/hwmon/asus-ec-sensors.c
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>
@@ -3201,6 +3196,12 @@ S:       Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 F:     drivers/platform/x86/asus-tf103c-dock.c
 
+ASUS WIRELESS RADIO CONTROL DRIVER
+M:     João Paulo Rechi Vita <jprvita@gmail.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/asus-wireless.c
+
 ASUS WMI HARDWARE MONITOR DRIVER
 M:     Ed Brindley <kernel@maidavale.org>
 M:     Denis Pauk <pauk.denis@gmail.com>
@@ -3208,18 +3209,6 @@ L:       linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/asus_wmi_sensors.c
 
-ASUS EC HARDWARE MONITOR DRIVER
-M:     Eugene Shalygin <eugene.shalygin@gmail.com>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     drivers/hwmon/asus-ec-sensors.c
-
-ASUS WIRELESS RADIO CONTROL DRIVER
-M:     João Paulo Rechi Vita <jprvita@gmail.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/asus-wireless.c
-
 ASYMMETRIC KEYS
 M:     David Howells <dhowells@redhat.com>
 L:     keyrings@vger.kernel.org
@@ -3359,10 +3348,10 @@ R:      Boqun Feng <boqun.feng@gmail.com>
 R:     Mark Rutland <mark.rutland@arm.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+F:     Documentation/atomic_*.txt
 F:     arch/*/include/asm/atomic*.h
 F:     include/*/atomic*.h
 F:     include/linux/refcount.h
-F:     Documentation/atomic_*.txt
 F:     scripts/atomic/
 
 ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
@@ -3421,10 +3410,10 @@ AXENTIA ARM DEVICES
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/at91-linea.dtsi
-F:     arch/arm/boot/dts/at91-natte.dtsi
-F:     arch/arm/boot/dts/at91-nattis-2-natte-2.dts
-F:     arch/arm/boot/dts/at91-tse850-3.dts
+F:     arch/arm/boot/dts/microchip/at91-linea.dtsi
+F:     arch/arm/boot/dts/microchip/at91-natte.dtsi
+F:     arch/arm/boot/dts/microchip/at91-nattis-2-natte-2.dts
+F:     arch/arm/boot/dts/microchip/at91-tse850-3.dts
 
 AXENTIA ASOC DRIVERS
 M:     Peter Rosin <peda@axentia.se>
@@ -3555,7 +3544,7 @@ F:        Documentation/filesystems/befs.rst
 F:     fs/befs/
 
 BFQ I/O SCHEDULER
-M:     Paolo Valente <paolo.valente@linaro.org>
+M:     Paolo Valente <paolo.valente@unimore.it>
 M:     Jens Axboe <axboe@kernel.dk>
 L:     linux-block@vger.kernel.org
 S:     Maintained
@@ -3623,6 +3612,7 @@ S:        Supported
 W:     http://www.bluez.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
+F:     Documentation/devicetree/bindings/net/bluetooth/
 F:     drivers/bluetooth/
 
 BLUETOOTH SUBSYSTEM
@@ -3656,50 +3646,6 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
 F:     drivers/iio/accel/bma400*
 
-BPF [GENERAL] (Safe Dynamic Programs and Tools)
-M:     Alexei Starovoitov <ast@kernel.org>
-M:     Daniel Borkmann <daniel@iogearbox.net>
-M:     Andrii Nakryiko <andrii@kernel.org>
-R:     Martin KaFai Lau <martin.lau@linux.dev>
-R:     Song Liu <song@kernel.org>
-R:     Yonghong Song <yhs@fb.com>
-R:     John Fastabend <john.fastabend@gmail.com>
-R:     KP Singh <kpsingh@kernel.org>
-R:     Stanislav Fomichev <sdf@google.com>
-R:     Hao Luo <haoluo@google.com>
-R:     Jiri Olsa <jolsa@kernel.org>
-L:     bpf@vger.kernel.org
-S:     Supported
-W:     https://bpf.io/
-Q:     https://patchwork.kernel.org/project/netdevbpf/list/?delegate=121173
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
-F:     Documentation/bpf/
-F:     Documentation/networking/filter.rst
-F:     Documentation/userspace-api/ebpf/
-F:     arch/*/net/*
-F:     include/linux/bpf*
-F:     include/linux/btf*
-F:     include/linux/filter.h
-F:     include/trace/events/xdp.h
-F:     include/uapi/linux/bpf*
-F:     include/uapi/linux/btf*
-F:     include/uapi/linux/filter.h
-F:     kernel/bpf/
-F:     kernel/trace/bpf_trace.c
-F:     lib/test_bpf.c
-F:     net/bpf/
-F:     net/core/filter.c
-F:     net/sched/act_bpf.c
-F:     net/sched/cls_bpf.c
-F:     samples/bpf/
-F:     scripts/bpf_doc.py
-F:     scripts/pahole-flags.sh
-F:     scripts/pahole-version.sh
-F:     tools/bpf/
-F:     tools/lib/bpf/
-F:     tools/testing/selftests/bpf/
-
 BPF JIT for ARM
 M:     Shubham Bansal <illusionist.neo@gmail.com>
 L:     bpf@vger.kernel.org
@@ -3778,79 +3724,79 @@ S:      Supported
 F:     arch/x86/net/
 X:     arch/x86/net/bpf_jit_comp32.c
 
+BPF [BTF]
+M:     Martin KaFai Lau <martin.lau@linux.dev>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     include/linux/btf*
+F:     kernel/bpf/btf.c
+
 BPF [CORE]
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 R:     John Fastabend <john.fastabend@gmail.com>
 L:     bpf@vger.kernel.org
 S:     Maintained
-F:     kernel/bpf/verifier.c
-F:     kernel/bpf/tnum.c
-F:     kernel/bpf/core.c
-F:     kernel/bpf/syscall.c
-F:     kernel/bpf/dispatcher.c
-F:     kernel/bpf/trampoline.c
 F:     include/linux/bpf*
 F:     include/linux/filter.h
 F:     include/linux/tnum.h
+F:     kernel/bpf/core.c
+F:     kernel/bpf/dispatcher.c
+F:     kernel/bpf/syscall.c
+F:     kernel/bpf/tnum.c
+F:     kernel/bpf/trampoline.c
+F:     kernel/bpf/verifier.c
 
-BPF [BTF]
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/btf.c
-F:     include/linux/btf*
-
-BPF [TRACING]
-M:     Song Liu <song@kernel.org>
-R:     Jiri Olsa <jolsa@kernel.org>
+BPF [DOCUMENTATION] (Related to Standardization)
+R:     David Vernet <void@manifault.com>
 L:     bpf@vger.kernel.org
+L:     bpf@ietf.org
 S:     Maintained
-F:     kernel/trace/bpf_trace.c
-F:     kernel/bpf/stackmap.c
+F:     Documentation/bpf/instruction-set.rst
 
-BPF [NETWORKING] (tc BPF, sock_addr)
-M:     Martin KaFai Lau <martin.lau@linux.dev>
+BPF [GENERAL] (Safe Dynamic Programs and Tools)
+M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
+M:     Andrii Nakryiko <andrii@kernel.org>
+R:     Martin KaFai Lau <martin.lau@linux.dev>
+R:     Song Liu <song@kernel.org>
+R:     Yonghong Song <yhs@fb.com>
 R:     John Fastabend <john.fastabend@gmail.com>
+R:     KP Singh <kpsingh@kernel.org>
+R:     Stanislav Fomichev <sdf@google.com>
+R:     Hao Luo <haoluo@google.com>
+R:     Jiri Olsa <jolsa@kernel.org>
 L:     bpf@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Maintained
+S:     Supported
+W:     https://bpf.io/
+Q:     https://patchwork.kernel.org/project/netdevbpf/list/?delegate=121173
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
+F:     Documentation/bpf/
+F:     Documentation/networking/filter.rst
+F:     Documentation/userspace-api/ebpf/
+F:     arch/*/net/*
+F:     include/linux/bpf*
+F:     include/linux/btf*
+F:     include/linux/filter.h
+F:     include/trace/events/xdp.h
+F:     include/uapi/linux/bpf*
+F:     include/uapi/linux/btf*
+F:     include/uapi/linux/filter.h
+F:     kernel/bpf/
+F:     kernel/trace/bpf_trace.c
+F:     lib/test_bpf.c
+F:     net/bpf/
 F:     net/core/filter.c
 F:     net/sched/act_bpf.c
 F:     net/sched/cls_bpf.c
-
-BPF [NETWORKING] (struct_ops, reuseport)
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/bpf_struct*
-
-BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
-M:     KP Singh <kpsingh@kernel.org>
-R:     Florent Revest <revest@chromium.org>
-R:     Brendan Jackman <jackmanb@chromium.org>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     Documentation/bpf/prog_lsm.rst
-F:     include/linux/bpf_lsm.h
-F:     kernel/bpf/bpf_lsm.c
-F:     security/bpf/
-
-BPF [STORAGE & CGROUPS]
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/cgroup.c
-F:     kernel/bpf/*storage.c
-F:     kernel/bpf/bpf_lru*
-
-BPF [RINGBUF]
-M:     Andrii Nakryiko <andrii@kernel.org>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/ringbuf.c
+F:     samples/bpf/
+F:     scripts/bpf_doc.py
+F:     scripts/pahole-flags.sh
+F:     scripts/pahole-version.sh
+F:     tools/bpf/
+F:     tools/lib/bpf/
+F:     tools/testing/selftests/bpf/
 
 BPF [ITERATOR]
 M:     Yonghong Song <yhs@fb.com>
@@ -3877,12 +3823,45 @@ L:      bpf@vger.kernel.org
 S:     Maintained
 F:     tools/lib/bpf/
 
-BPF [TOOLING] (bpftool)
-M:     Quentin Monnet <quentin@isovalent.com>
+BPF [MISC]
 L:     bpf@vger.kernel.org
+S:     Odd Fixes
+K:     (?:\b|_)bpf(?:\b|_)
+
+BPF [NETWORKING] (struct_ops, reuseport)
+M:     Martin KaFai Lau <martin.lau@linux.dev>
+L:     bpf@vger.kernel.org
+L:     netdev@vger.kernel.org
 S:     Maintained
-F:     kernel/bpf/disasm.*
-F:     tools/bpf/bpftool/
+F:     kernel/bpf/bpf_struct*
+
+BPF [NETWORKING] (tc BPF, sock_addr)
+M:     Martin KaFai Lau <martin.lau@linux.dev>
+M:     Daniel Borkmann <daniel@iogearbox.net>
+R:     John Fastabend <john.fastabend@gmail.com>
+L:     bpf@vger.kernel.org
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     net/core/filter.c
+F:     net/sched/act_bpf.c
+F:     net/sched/cls_bpf.c
+
+BPF [RINGBUF]
+M:     Andrii Nakryiko <andrii@kernel.org>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     kernel/bpf/ringbuf.c
+
+BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
+M:     KP Singh <kpsingh@kernel.org>
+R:     Florent Revest <revest@chromium.org>
+R:     Brendan Jackman <jackmanb@chromium.org>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     Documentation/bpf/prog_lsm.rst
+F:     include/linux/bpf_lsm.h
+F:     kernel/bpf/bpf_lsm.c
+F:     security/bpf/
 
 BPF [SELFTESTS] (Test Runners & Infrastructure)
 M:     Andrii Nakryiko <andrii@kernel.org>
@@ -3891,17 +3870,28 @@ L:      bpf@vger.kernel.org
 S:     Maintained
 F:     tools/testing/selftests/bpf/
 
-BPF [DOCUMENTATION] (Related to Standardization)
-R:     David Vernet <void@manifault.com>
+BPF [STORAGE & CGROUPS]
+M:     Martin KaFai Lau <martin.lau@linux.dev>
 L:     bpf@vger.kernel.org
-L:     bpf@ietf.org
 S:     Maintained
-F:     Documentation/bpf/instruction-set.rst
+F:     kernel/bpf/*storage.c
+F:     kernel/bpf/bpf_lru*
+F:     kernel/bpf/cgroup.c
 
-BPF [MISC]
+BPF [TOOLING] (bpftool)
+M:     Quentin Monnet <quentin@isovalent.com>
 L:     bpf@vger.kernel.org
-S:     Odd Fixes
-K:     (?:\b|_)bpf(?:\b|_)
+S:     Maintained
+F:     kernel/bpf/disasm.*
+F:     tools/bpf/bpftool/
+
+BPF [TRACING]
+M:     Song Liu <song@kernel.org>
+R:     Jiri Olsa <jolsa@kernel.org>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     kernel/bpf/stackmap.c
+F:     kernel/trace/bpf_trace.c
 
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Michael Chan <michael.chan@broadcom.com>
@@ -3910,7 +3900,7 @@ S:        Supported
 F:     drivers/net/ethernet/broadcom/b44.*
 
 BROADCOM B53/SF2 ETHERNET SWITCH DRIVER
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 L:     netdev@vger.kernel.org
 L:     openwrt-devel@lists.openwrt.org (subscribers-only)
 S:     Supported
@@ -3920,36 +3910,8 @@ F:       drivers/net/dsa/bcm_sf2*
 F:     include/linux/dsa/brcm.h
 F:     include/linux/platform_data/b53.h
 
-BROADCOM BCMBCA ARM ARCHITECTURE
-M:     William Zhang <william.zhang@broadcom.com>
-M:     Anand Gore <anand.gore@broadcom.com>
-M:     Kursad Oney <kursad.oney@broadcom.com>
-M:     Florian Fainelli <f.fainelli@gmail.com>
-M:     Rafał Miłecki <rafal@milecki.pl>
-R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-T:     git https://github.com/broadcom/stblinux.git
-F:     Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
-F:     arch/arm64/boot/dts/broadcom/bcmbca/*
-N:     bcmbca
-N:     bcm[9]?47622
-N:     bcm[9]?4912
-N:     bcm[9]?63138
-N:     bcm[9]?63146
-N:     bcm[9]?63148
-N:     bcm[9]?63158
-N:     bcm[9]?63178
-N:     bcm[9]?6756
-N:     bcm[9]?6813
-N:     bcm[9]?6846
-N:     bcm[9]?6855
-N:     bcm[9]?6856
-N:     bcm[9]?6858
-N:     bcm[9]?6878
-
 BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -3963,7 +3925,7 @@ N:        bcm283*
 N:     raspberrypi
 
 BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 M:     Ray Jui <rjui@broadcom.com>
 M:     Scott Branden <sbranden@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
@@ -4002,25 +3964,26 @@ F:      Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
 F:     drivers/pinctrl/bcm/pinctrl-bcm4908.c
 
 BROADCOM BCM5301X ARM ARCHITECTURE
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 M:     Hauke Mehrtens <hauke@hauke-m.de>
 M:     Rafał Miłecki <zajec5@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/bcm470*
-F:     arch/arm/boot/dts/bcm5301*
-F:     arch/arm/boot/dts/bcm953012*
+F:     arch/arm/boot/dts/broadcom/bcm-ns.dtsi
+F:     arch/arm/boot/dts/broadcom/bcm470*
+F:     arch/arm/boot/dts/broadcom/bcm5301*
+F:     arch/arm/boot/dts/broadcom/bcm953012*
 F:     arch/arm/mach-bcm/bcm_5301x.c
 
 BROADCOM BCM53573 ARM ARCHITECTURE
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 M:     Rafał Miłecki <rafal@milecki.pl>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/boot/dts/bcm47189*
-F:     arch/arm/boot/dts/bcm53573*
+F:     arch/arm/boot/dts/broadcom/bcm47189*
+F:     arch/arm/boot/dts/broadcom/bcm53573*
 
 BROADCOM BCM63XX/BCM33XX UDC DRIVER
 M:     Kevin Cernekee <cernekee@gmail.com>
@@ -4029,13 +3992,13 @@ S:      Maintained
 F:     drivers/usb/gadget/udc/bcm63xx_udc.*
 
 BROADCOM BCM7XXX ARM ARCHITECTURE
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git https://github.com/broadcom/stblinux.git
 F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
-F:     arch/arm/boot/dts/bcm7*.dts*
+F:     arch/arm/boot/dts/broadcom/bcm7*.dts*
 F:     arch/arm/include/asm/hardware/cache-b15-rac.h
 F:     arch/arm/mach-bcm/*brcmstb*
 F:     arch/arm/mm/cache-b15-rac.c
@@ -4045,11 +4008,39 @@ N:      brcmstb
 N:     bcm7038
 N:     bcm7120
 
+BROADCOM BCMBCA ARM ARCHITECTURE
+M:     William Zhang <william.zhang@broadcom.com>
+M:     Anand Gore <anand.gore@broadcom.com>
+M:     Kursad Oney <kursad.oney@broadcom.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
+M:     Rafał Miłecki <rafal@milecki.pl>
+R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+T:     git https://github.com/broadcom/stblinux.git
+F:     Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+F:     arch/arm64/boot/dts/broadcom/bcmbca/*
+N:     bcmbca
+N:     bcm[9]?47622
+N:     bcm[9]?4912
+N:     bcm[9]?63138
+N:     bcm[9]?63146
+N:     bcm[9]?63148
+N:     bcm[9]?63158
+N:     bcm[9]?63178
+N:     bcm[9]?6756
+N:     bcm[9]?6813
+N:     bcm[9]?6846
+N:     bcm[9]?6855
+N:     bcm[9]?6856
+N:     bcm[9]?6858
+N:     bcm[9]?6878
+
 BROADCOM BDC DRIVER
-M:     Justin Chen <justinpopo6@gmail.com>
+M:     Justin Chen <justin.chen@broadcom.com>
 M:     Al Cooper <alcooperx@gmail.com>
-L:     linux-usb@vger.kernel.org
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
+L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/usb/brcm,bdc.yaml
 F:     drivers/usb/gadget/udc/bdc/
@@ -4062,7 +4053,7 @@ S:        Maintained
 F:     drivers/cpufreq/bmips-cpufreq.c
 
 BROADCOM BMIPS MIPS ARCHITECTURE
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-mips@vger.kernel.org
 S:     Maintained
@@ -4071,10 +4062,10 @@ F:      arch/mips/bmips/*
 F:     arch/mips/boot/dts/brcm/bcm*.dts*
 F:     arch/mips/include/asm/mach-bmips/*
 F:     arch/mips/kernel/*bmips*
-F:     drivers/soc/bcm/bcm63xx
 F:     drivers/irqchip/irq-bcm63*
 F:     drivers/irqchip/irq-bcm7*
 F:     drivers/irqchip/irq-brcmstb*
+F:     drivers/soc/bcm/bcm63xx
 F:     include/linux/bcm963xx_nvram.h
 F:     include/linux/bcm963xx_tag.h
 
@@ -4130,14 +4121,14 @@ F:      drivers/net/wireless/broadcom/brcm80211/
 
 BROADCOM BRCMSTB GPIO DRIVER
 M:     Doug Berger <opendmb@gmail.com>
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
 F:     drivers/gpio/gpio-brcmstb.c
 
 BROADCOM BRCMSTB I2C DRIVER
-M:     Kamal Dasu <kdasu.kdev@gmail.com>
+M:     Kamal Dasu <kamal.dasu@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-i2c@vger.kernel.org
 S:     Supported
@@ -4153,7 +4144,7 @@ F:        Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
 F:     drivers/tty/serial/8250/8250_bcm7271.c
 
 BROADCOM BRCMSTB USB EHCI DRIVER
-M:     Justin Chen <justinpopo6@gmail.com>
+M:     Justin Chen <justin.chen@broadcom.com>
 M:     Al Cooper <alcooperx@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-usb@vger.kernel.org
@@ -4170,7 +4161,7 @@ F:        Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
 F:     drivers/usb/misc/brcmstb-usb-pinmap.c
 
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
-M:     Justin Chen <justinpopo6@gmail.com>
+M:     Justin Chen <justin.chen@broadcom.com>
 M:     Al Cooper <alcooperx@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-kernel@vger.kernel.org
@@ -4189,7 +4180,7 @@ F:        drivers/spi/spi-bcm63xx-hsspi.c
 F:     drivers/spi/spi-bcmbca-hsspi.c
 
 BROADCOM ETHERNET PHY DRIVERS
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -4200,7 +4191,7 @@ F:        include/linux/brcmphy.h
 
 BROADCOM GENET ETHERNET DRIVER
 M:     Doug Berger <opendmb@gmail.com>
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -4284,7 +4275,7 @@ F:        drivers/firmware/broadcom/*
 
 BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
 M:     Rafał Miłecki <rafal@milecki.pl>
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
@@ -4300,7 +4291,7 @@ F:        drivers/bcma/
 F:     include/linux/bcma/
 
 BROADCOM SPI DRIVER
-M:     Kamal Dasu <kdasu.kdev@gmail.com>
+M:     Kamal Dasu <kamal.dasu@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
@@ -4334,7 +4325,7 @@ F:        drivers/memory/brcmstb_dpfe.c
 
 BROADCOM STB NAND FLASH DRIVER
 M:     Brian Norris <computersforpeace@gmail.com>
-M:     Kamal Dasu <kdasu.kdev@gmail.com>
+M:     Kamal Dasu <kamal.dasu@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
@@ -4344,7 +4335,7 @@ F:        include/linux/platform_data/brcmnand.h
 BROADCOM STB PCIE DRIVER
 M:     Jim Quinlan <jim2101024@gmail.com>
 M:     Nicolas Saenz Julienne <nsaenz@kernel.org>
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
@@ -4352,13 +4343,13 @@ F:      Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:     drivers/pci/controller/pcie-brcmstb.c
 
 BROADCOM SYSTEMPORT ETHERNET DRIVER
-M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     Florian Fainelli <florian.fainelli@broadcom.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     netdev@vger.kernel.org
 S:     Supported
+F:     Documentation/devicetree/bindings/net/brcm,systemport.yaml
 F:     drivers/net/ethernet/broadcom/bcmsysport.*
 F:     drivers/net/ethernet/broadcom/unimac.h
-F:     Documentation/devicetree/bindings/net/brcm,systemport.yaml
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:     Siva Reddy Kallam <siva.kallam@broadcom.com>
@@ -4490,29 +4481,6 @@ W:       https://github.com/Cascoda/ca8210-linux.git
 F:     Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
 F:     drivers/net/ieee802154/ca8210.c
 
-CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
-M:     Damien Le Moal <dlemoal@kernel.org>
-L:     linux-riscv@lists.infradead.org
-L:     linux-gpio@vger.kernel.org (pinctrl driver)
-F:     Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
-F:     drivers/pinctrl/pinctrl-k210.c
-
-CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
-M:     Damien Le Moal <dlemoal@kernel.org>
-L:     linux-kernel@vger.kernel.org
-L:     linux-riscv@lists.infradead.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml
-F:     drivers/reset/reset-k210.c
-
-CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
-M:     Damien Le Moal <dlemoal@kernel.org>
-L:     linux-riscv@lists.infradead.org
-S:     Maintained
-F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
-F:     drivers/soc/canaan/
-F:     include/soc/canaan/
-
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:     David Howells <dhowells@redhat.com>
 L:     linux-cachefs@redhat.com (moderated for non-subscribers)
@@ -4520,6 +4488,13 @@ S:       Supported
 F:     Documentation/filesystems/caching/cachefiles.rst
 F:     fs/cachefiles/
 
+CACHESTAT: PAGE CACHE STATS FOR A FILE
+M:     Nhat Pham <nphamcs@gmail.com>
+M:     Johannes Weiner <hannes@cmpxchg.org>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     tools/testing/selftests/cachestat/test_cachestat.c
+
 CADENCE MIPI-CSI2 BRIDGES
 M:     Maxime Ripard <mripard@kernel.org>
 L:     linux-media@vger.kernel.org
@@ -4634,6 +4609,29 @@ F:       Documentation/networking/j1939.rst
 F:     include/uapi/linux/can/j1939.h
 F:     net/can/j1939/
 
+CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
+M:     Damien Le Moal <dlemoal@kernel.org>
+L:     linux-riscv@lists.infradead.org
+L:     linux-gpio@vger.kernel.org (pinctrl driver)
+F:     Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
+F:     drivers/pinctrl/pinctrl-k210.c
+
+CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
+M:     Damien Le Moal <dlemoal@kernel.org>
+L:     linux-kernel@vger.kernel.org
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml
+F:     drivers/reset/reset-k210.c
+
+CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
+M:     Damien Le Moal <dlemoal@kernel.org>
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
+F:     drivers/soc/canaan/
+F:     include/soc/canaan/
+
 CAPABILITIES
 M:     Serge Hallyn <serge@hallyn.com>
 L:     linux-security-module@vger.kernel.org
@@ -4693,8 +4691,8 @@ F:        arch/arm64/boot/dts/cavium/thunder2-99xx*
 
 CBS/ETF/TAPRIO QDISCS
 M:     Vinicius Costa Gomes <vinicius.gomes@intel.com>
-S:     Maintained
 L:     netdev@vger.kernel.org
+S:     Maintained
 F:     net/sched/sch_cbs.c
 F:     net/sched/sch_etf.c
 F:     net/sched/sch_taprio.c
@@ -4717,10 +4715,10 @@ CCTRNG ARM TRUSTZONE CRYPTOCELL TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
 M:     Hadar Gat <hadar.gat@arm.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
+W:     https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
+F:     Documentation/devicetree/bindings/rng/arm-cctrng.yaml
 F:     drivers/char/hw_random/cctrng.c
 F:     drivers/char/hw_random/cctrng.h
-F:     Documentation/devicetree/bindings/rng/arm-cctrng.yaml
-W:     https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 
 CEC FRAMEWORK
 M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
@@ -4880,13 +4878,6 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
 F:     sound/soc/codecs/cros_ec_codec.*
 
-CHROMEOS EC UART DRIVER
-M:     Bhanu Prakash Maiya <bhanumaiya@chromium.org>
-R:     Benson Leung <bleung@chromium.org>
-R:     Tzung-Bi Shih <tzungbi@kernel.org>
-S:     Maintained
-F:     drivers/platform/chrome/cros_ec_uart.c
-
 CHROMEOS EC SUBDRIVERS
 M:     Benson Leung <bleung@chromium.org>
 R:     Guenter Roeck <groeck@chromium.org>
@@ -4896,13 +4887,12 @@ F:      drivers/power/supply/cros_usbpd-charger.c
 N:     cros_ec
 N:     cros-ec
 
-CHROMEOS EC USB TYPE-C DRIVER
-M:     Prashant Malani <pmalani@chromium.org>
-L:     chrome-platform@lists.linux.dev
+CHROMEOS EC UART DRIVER
+M:     Bhanu Prakash Maiya <bhanumaiya@chromium.org>
+R:     Benson Leung <bleung@chromium.org>
+R:     Tzung-Bi Shih <tzungbi@kernel.org>
 S:     Maintained
-F:     drivers/platform/chrome/cros_ec_typec.*
-F:     drivers/platform/chrome/cros_typec_switch.c
-F:     drivers/platform/chrome/cros_typec_vdm.*
+F:     drivers/platform/chrome/cros_ec_uart.c
 
 CHROMEOS EC USB PD NOTIFY DRIVER
 M:     Prashant Malani <pmalani@chromium.org>
@@ -4911,6 +4901,14 @@ S:       Maintained
 F:     drivers/platform/chrome/cros_usbpd_notify.c
 F:     include/linux/platform_data/cros_usbpd_notify.h
 
+CHROMEOS EC USB TYPE-C DRIVER
+M:     Prashant Malani <pmalani@chromium.org>
+L:     chrome-platform@lists.linux.dev
+S:     Maintained
+F:     drivers/platform/chrome/cros_ec_typec.*
+F:     drivers/platform/chrome/cros_typec_switch.c
+F:     drivers/platform/chrome/cros_typec_vdm.*
+
 CHROMEOS HPS DRIVER
 M:     Dan Callaghan <dcallagh@chromium.org>
 R:     Sami Kyöstilä <skyostil@chromium.org>
@@ -4928,7 +4926,6 @@ F:        drivers/media/cec/i2c/ch7322.c
 CIRRUS LOGIC AUDIO CODEC DRIVERS
 M:     James Schulman <james.schulman@cirrus.com>
 M:     David Rhodes <david.rhodes@cirrus.com>
-M:     Lucas Tanure <tanureal@opensource.cirrus.com>
 M:     Richard Fitzgerald <rf@opensource.cirrus.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:     patches@opensource.cirrus.com
@@ -5028,6 +5025,18 @@ M:       Nelson Escobar <neescoba@cisco.com>
 S:     Supported
 F:     drivers/infiniband/hw/usnic/
 
+CLANG CONTROL FLOW INTEGRITY SUPPORT
+M:     Sami Tolvanen <samitolvanen@google.com>
+M:     Kees Cook <keescook@chromium.org>
+R:     Nathan Chancellor <nathan@kernel.org>
+R:     Nick Desaulniers <ndesaulniers@google.com>
+L:     llvm@lists.linux.dev
+S:     Supported
+B:     https://github.com/ClangBuiltLinux/linux/issues
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
+F:     include/linux/cfi.h
+F:     kernel/cfi.c
+
 CLANG-FORMAT FILE
 M:     Miguel Ojeda <ojeda@kernel.org>
 S:     Maintained
@@ -5048,18 +5057,6 @@ F:       scripts/Makefile.clang
 F:     scripts/clang-tools/
 K:     \b(?i:clang|llvm)\b
 
-CLANG CONTROL FLOW INTEGRITY SUPPORT
-M:     Sami Tolvanen <samitolvanen@google.com>
-M:     Kees Cook <keescook@chromium.org>
-R:     Nathan Chancellor <nathan@kernel.org>
-R:     Nick Desaulniers <ndesaulniers@google.com>
-L:     llvm@lists.linux.dev
-S:     Supported
-B:     https://github.com/ClangBuiltLinux/linux/issues
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
-F:     include/linux/cfi.h
-F:     kernel/cfi.c
-
 CLK API
 M:     Russell King <linux@armlinux.org.uk>
 L:     linux-clk@vger.kernel.org
@@ -5150,7 +5147,7 @@ X:        drivers/clk/clkdev.c
 
 COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)
 M:     Steve French <sfrench@samba.org>
-R:     Paulo Alcantara <pc@cjr.nz> (DFS, global name space)
+R:     Paulo Alcantara <pc@manguebit.com> (DFS, global name space)
 R:     Ronnie Sahlberg <lsahlber@redhat.com> (directory leases, sparse files)
 R:     Shyam Prasad N <sprasad@microsoft.com> (multichannel)
 R:     Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
@@ -5160,8 +5157,8 @@ S:        Supported
 W:     https://wiki.samba.org/index.php/LinuxCIFS
 T:     git git://git.samba.org/sfrench/cifs-2.6.git
 F:     Documentation/admin-guide/cifs/
-F:     fs/cifs/
-F:     fs/smbfs_common/
+F:     fs/smb/client/
+F:     fs/smb/common/
 F:     include/uapi/linux/cifs
 
 COMPACTPCI HOTPLUG CORE
@@ -5230,8 +5227,8 @@ CONTEXT TRACKING
 M:     Frederic Weisbecker <frederic@kernel.org>
 M:     "Paul E. McKenney" <paulmck@kernel.org>
 S:     Maintained
-F:     kernel/context_tracking.c
 F:     include/linux/context_tracking*
+F:     kernel/context_tracking.c
 
 CONTROL GROUP (CGROUP)
 M:     Tejun Heo <tj@kernel.org>
@@ -5355,6 +5352,18 @@ F:       include/linux/sched/cpufreq.h
 F:     kernel/sched/cpufreq*.c
 F:     tools/testing/selftests/cpufreq/
 
+CPU HOTPLUG
+M:     Thomas Gleixner <tglx@linutronix.de>
+M:     Peter Zijlstra <peterz@infradead.org>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git smp/core
+F:     kernel/cpu.c
+F:     kernel/smpboot.*
+F:     include/linux/cpu.h
+F:     include/linux/cpuhotplug.h
+F:     include/linux/smpboot.h
+
 CPU IDLE TIME MANAGEMENT FRAMEWORK
 M:     "Rafael J. Wysocki" <rafael@kernel.org>
 M:     Daniel Lezcano <daniel.lezcano@linaro.org>
@@ -5392,8 +5401,8 @@ F:        drivers/cpuidle/cpuidle-big_little.c
 
 CPUIDLE DRIVER - ARM EXYNOS
 M:     Daniel Lezcano <daniel.lezcano@linaro.org>
-R:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 M:     Kukjin Kim <kgene@kernel.org>
+R:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 L:     linux-pm@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Supported
@@ -5414,8 +5423,8 @@ M:        Ulf Hansson <ulf.hansson@linaro.org>
 L:     linux-pm@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
-F:     drivers/cpuidle/cpuidle-psci.h
 F:     drivers/cpuidle/cpuidle-psci-domain.c
+F:     drivers/cpuidle/cpuidle-psci.h
 
 CPUIDLE DRIVER - DT IDLE PM DOMAIN
 M:     Ulf Hansson <ulf.hansson@linaro.org>
@@ -5559,19 +5568,19 @@ S:      Supported
 W:     http://www.chelsio.com
 F:     drivers/crypto/chelsio
 
-CXGB4 INLINE CRYPTO DRIVER
-M:     Ayush Sawal <ayush.sawal@chelsio.com>
+CXGB4 ETHERNET DRIVER (CXGB4)
+M:     Raju Rangoju <rajur@chelsio.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
-F:     drivers/net/ethernet/chelsio/inline_crypto/
+F:     drivers/net/ethernet/chelsio/cxgb4/
 
-CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Raju Rangoju <rajur@chelsio.com>
+CXGB4 INLINE CRYPTO DRIVER
+M:     Ayush Sawal <ayush.sawal@chelsio.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
-F:     drivers/net/ethernet/chelsio/cxgb4/
+F:     drivers/net/ethernet/chelsio/inline_crypto/
 
 CXGB4 ISCSI DRIVER (CXGB4I)
 M:     Varun Prakash <varun@chelsio.com>
@@ -5628,16 +5637,6 @@ CYCLADES PC300 DRIVER
 S:     Orphan
 F:     drivers/net/wan/pc300*
 
-CYPRESS_FIRMWARE MEDIA DRIVER
-M:     Antti Palosaari <crope@iki.fi>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-W:     https://linuxtv.org
-W:     http://palosaari.fi/linux/
-Q:     http://patchwork.linuxtv.org/project/linux-media/list/
-T:     git git://linuxtv.org/anttip/media_tree.git
-F:     drivers/media/common/cypress_firmware*
-
 CYPRESS CY8C95X0 PINCTRL DRIVER
 M:     Patrick Rudolph <patrick.rudolph@9elements.com>
 L:     linux-gpio@vger.kernel.org
@@ -5657,6 +5656,16 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/input/cypress-sf.yaml
 F:     drivers/input/keyboard/cypress-sf.c
 
+CYPRESS_FIRMWARE MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+W:     https://linuxtv.org
+W:     http://palosaari.fi/linux/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+T:     git git://linuxtv.org/anttip/media_tree.git
+F:     drivers/media/common/cypress_firmware*
+
 CYTTSP TOUCHSCREEN DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-input@vger.kernel.org
@@ -5739,6 +5748,14 @@ F:       include/linux/tfrc.h
 F:     include/uapi/linux/dccp.h
 F:     net/dccp/
 
+DEBUGOBJECTS:
+M:     Thomas Gleixner <tglx@linutronix.de>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/debugobjects
+F:     lib/debugobjects.c
+F:     include/linux/debugobjects.h
+
 DECSTATION PLATFORM SUPPORT
 M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 L:     linux-mips@vger.kernel.org
@@ -5823,11 +5840,6 @@ S:       Maintained
 F:     Documentation/driver-api/dcdbas.rst
 F:     drivers/platform/x86/dell/dcdbas.*
 
-DELL WMI DESCRIPTOR DRIVER
-L:     Dell.Client.Kernel@dell.com
-S:     Maintained
-F:     drivers/platform/x86/dell/dell-wmi-descriptor.c
-
 DELL WMI DDV DRIVER
 M:     Armin Wolf <W_Armin@gmx.de>
 S:     Maintained
@@ -5835,13 +5847,17 @@ F:      Documentation/ABI/testing/debugfs-dell-wmi-ddv
 F:     Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv
 F:     drivers/platform/x86/dell/dell-wmi-ddv.c
 
-DELL WMI SYSMAN DRIVER
-M:     Prasanth Ksr <prasanth.ksr@dell.com>
+DELL WMI DESCRIPTOR DRIVER
+L:     Dell.Client.Kernel@dell.com
+S:     Maintained
+F:     drivers/platform/x86/dell/dell-wmi-descriptor.c
+
+DELL WMI HARDWARE PRIVACY SUPPORT
+M:     Perry Yuan <Perry.Yuan@dell.com>
 L:     Dell.Client.Kernel@dell.com
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     Documentation/ABI/testing/sysfs-class-firmware-attributes
-F:     drivers/platform/x86/dell/dell-wmi-sysman/
+F:     drivers/platform/x86/dell/dell-wmi-privacy.c
 
 DELL WMI NOTIFICATIONS DRIVER
 M:     Matthew Garrett <mjg59@srcf.ucam.org>
@@ -5849,20 +5865,13 @@ M:      Pali Rohár <pali@kernel.org>
 S:     Maintained
 F:     drivers/platform/x86/dell/dell-wmi-base.c
 
-DELL WMI HARDWARE PRIVACY SUPPORT
-M:     Perry Yuan <Perry.Yuan@dell.com>
+DELL WMI SYSMAN DRIVER
+M:     Prasanth Ksr <prasanth.ksr@dell.com>
 L:     Dell.Client.Kernel@dell.com
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/dell/dell-wmi-privacy.c
-
-DELTA ST MEDIA DRIVER
-M:     Hugues Fruchet <hugues.fruchet@foss.st.com>
-L:     linux-media@vger.kernel.org
-S:     Supported
-W:     https://linuxtv.org
-T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/st/sti/delta
+F:     Documentation/ABI/testing/sysfs-class-firmware-attributes
+F:     drivers/platform/x86/dell/dell-wmi-sysman/
 
 DELTA AHE-50DC FAN CONTROL MODULE DRIVER
 M:     Zev Weiss <zev@bewilderbeest.net>
@@ -5886,6 +5895,14 @@ F:       Documentation/devicetree/bindings/reset/delta,tn48m-reset.yaml
 F:     drivers/gpio/gpio-tn48m.c
 F:     include/dt-bindings/reset/delta,tn48m-reset.h
 
+DELTA ST MEDIA DRIVER
+M:     Hugues Fruchet <hugues.fruchet@foss.st.com>
+L:     linux-media@vger.kernel.org
+S:     Supported
+W:     https://linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/platform/st/sti/delta
+
 DENALI NAND DRIVER
 L:     linux-mtd@lists.infradead.org
 S:     Orphan
@@ -5898,13 +5915,6 @@ S:       Maintained
 F:     drivers/dma/dw-edma/
 F:     include/linux/dma/edma.h
 
-DESIGNWARE XDATA IP DRIVER
-M:     Gustavo Pimentel <gustavo.pimentel@synopsys.com>
-L:     linux-pci@vger.kernel.org
-S:     Maintained
-F:     Documentation/misc-devices/dw-xdata-pcie.rst
-F:     drivers/misc/dw-xdata-pcie.c
-
 DESIGNWARE USB2 DRD IP DRIVER
 M:     Minas Harutyunyan <hminas@synopsys.com>
 L:     linux-usb@vger.kernel.org
@@ -5918,6 +5928,13 @@ L:       linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/dwc3/
 
+DESIGNWARE XDATA IP DRIVER
+M:     Gustavo Pimentel <gustavo.pimentel@synopsys.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/misc-devices/dw-xdata-pcie.rst
+F:     drivers/misc/dw-xdata-pcie.c
+
 DEVANTECH SRF ULTRASONIC RANGER IIO DRIVER
 M:     Andreas Klinger <ak@it-klinger.de>
 L:     linux-iio@vger.kernel.org
@@ -6009,15 +6026,15 @@ DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT
 M:     Christoph Niedermaier <cniedermaier@dh-electronics.com>
 L:     kernel@dh-electronics.com
 S:     Maintained
-F:     arch/arm/boot/dts/imx6*-dhcom-*
-F:     arch/arm/boot/dts/imx6*-dhcor-*
+F:     arch/arm/boot/dts/nxp/imx/imx6*-dhcom-*
+F:     arch/arm/boot/dts/nxp/imx/imx6*-dhcor-*
 
 DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
 M:     Marek Vasut <marex@denx.de>
 L:     kernel@dh-electronics.com
 S:     Maintained
-F:     arch/arm/boot/dts/stm32mp1*-dhcom-*
-F:     arch/arm/boot/dts/stm32mp1*-dhcor-*
+F:     arch/arm/boot/dts/st/stm32mp1*-dhcom-*
+F:     arch/arm/boot/dts/st/stm32mp1*-dhcor-*
 
 DIALOG SEMICONDUCTOR DRIVERS
 M:     Support Opensource <support.opensource@diasemi.com>
@@ -6026,9 +6043,9 @@ 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/mfd/dlg,da90*.yaml
 F:     Documentation/devicetree/bindings/regulator/da92*.txt
+F:     Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
 F:     Documentation/devicetree/bindings/regulator/slg51000.txt
 F:     Documentation/devicetree/bindings/sound/da[79]*.txt
 F:     Documentation/devicetree/bindings/thermal/da90??-thermal.txt
@@ -6147,6 +6164,12 @@ F:       include/linux/dma/
 F:     include/linux/dmaengine.h
 F:     include/linux/of_dma.h
 
+DMA MAPPING BENCHMARK
+M:     Xiang Chen <chenxiang66@hisilicon.com>
+L:     iommu@lists.linux.dev
+F:     kernel/dma/map_benchmark.c
+F:     tools/testing/selftests/dma/
+
 DMA MAPPING HELPERS
 M:     Christoph Hellwig <hch@lst.de>
 M:     Marek Szyprowski <m.szyprowski@samsung.com>
@@ -6157,17 +6180,11 @@ W:      http://git.infradead.org/users/hch/dma-mapping.git
 T:     git git://git.infradead.org/users/hch/dma-mapping.git
 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/dma-mapping.h
 F:     include/linux/swiotlb.h
 F:     kernel/dma/
 
-DMA MAPPING BENCHMARK
-M:     Xiang Chen <chenxiang66@hisilicon.com>
-L:     iommu@lists.linux.dev
-F:     kernel/dma/map_benchmark.c
-F:     tools/testing/selftests/dma/
-
 DMA-BUF HEAPS FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
 R:     Benjamin Gaignard <benjamin.gaignard@collabora.com>
@@ -6225,10 +6242,17 @@ X:      Documentation/devicetree/
 X:     Documentation/driver-api/media/
 X:     Documentation/firmware-guide/acpi/
 X:     Documentation/i2c/
+X:     Documentation/netlink/
 X:     Documentation/power/
 X:     Documentation/spi/
 X:     Documentation/userspace-api/media/
 
+DOCUMENTATION PROCESS
+M:     Jonathan Corbet <corbet@lwn.net>
+S:     Maintained
+F:     Documentation/process/
+L:     workflows@vger.kernel.org
+
 DOCUMENTATION REPORTING ISSUES
 M:     Thorsten Leemhuis <linux@leemhuis.info>
 L:     linux-doc@vger.kernel.org
@@ -6357,6 +6381,25 @@ S:       Maintained
 F:     drivers/soc/ti/smartreflex.c
 F:     include/linux/power/smartreflex.h
 
+DRM ACCEL DRIVERS FOR INTEL VPU
+M:     Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+M:     Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Supported
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/accel/ivpu/
+F:     include/uapi/drm/ivpu_accel.h
+
+DRM COMPUTE ACCELERATORS DRIVERS AND FRAMEWORK
+M:     Oded Gabbay <ogabbay@kernel.org>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+C:     irc://irc.oftc.net/dri-devel
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git
+F:     Documentation/accel/
+F:     drivers/accel/
+F:     include/drm/drm_accel.h
+
 DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
 M:     Maxime Ripard <mripard@kernel.org>
 M:     Chen-Yu Tsai <wens@csie.org>
@@ -6439,6 +6482,21 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
 F:     drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
 
+DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
+M:     Thomas Zimmermann <tzimmermann@suse.de>
+M:     Javier Martinez Canillas <javierm@redhat.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/drm_aperture.c
+F:     drivers/gpu/drm/tiny/ofdrm.c
+F:     drivers/gpu/drm/tiny/simpledrm.c
+F:     drivers/video/aperture.c
+F:     drivers/video/nomodeset.c
+F:     include/drm/drm_aperture.h
+F:     include/linux/aperture.h
+F:     include/video/nomodeset.h
+
 DRM DRIVER FOR GENERIC EDP PANELS
 R:     Douglas Anderson <dianders@chromium.org>
 F:     Documentation/devicetree/bindings/display/panel/panel-edp.yaml
@@ -6473,6 +6531,14 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/himax,hx8357d.txt
 F:     drivers/gpu/drm/tiny/hx8357d.c
 
+DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE
+M:     Deepak Rawat <drawat.floss@gmail.com>
+L:     linux-hyperv@vger.kernel.org
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/hyperv
+
 DRM DRIVER FOR ILITEK ILI9225 PANELS
 M:     David Lechner <david@lechnology.com>
 S:     Maintained
@@ -6502,11 +6568,11 @@ F:      drivers/gpu/drm/logicvc/
 DRM DRIVER FOR LVDS PANELS
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     dri-devel@lists.freedesktop.org
-T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/panel/panel-lvds.c
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/lvds.yaml
 F:     Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
+F:     drivers/gpu/drm/panel/panel-lvds.c
 
 DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 M:     Guido Günther <agx@sigxcpu.org>
@@ -6543,6 +6609,7 @@ M:        Rob Clark <robdclark@gmail.com>
 M:     Abhinav Kumar <quic_abhinavk@quicinc.com>
 M:     Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
 R:     Sean Paul <sean@poorly.run>
+R:     Marijn Suijten <marijn.suijten@somainline.org>
 L:     linux-arm-msm@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
 L:     freedreno@lists.freedesktop.org
@@ -6615,13 +6682,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/repaper.txt
 F:     drivers/gpu/drm/tiny/repaper.c
 
-DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
-M:     Javier Martinez Canillas <javierm@redhat.com>
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
-F:     drivers/gpu/drm/solomon/ssd130x*
-
 DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 M:     Dave Airlie <airlied@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
@@ -6670,28 +6730,11 @@ S:      Maintained
 F:     Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
 F:     drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
 
-DRM DRIVER FOR SITRONIX ST7703 PANELS
-M:     Guido Günther <agx@sigxcpu.org>
-R:     Purism Kernel Team <kernel@puri.sm>
-R:     Ondrej Jirman <megous@megous.com>
-S:     Maintained
-F:     Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-F:     drivers/gpu/drm/panel/panel-sitronix-st7703.c
-
-DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
-M:     Thomas Zimmermann <tzimmermann@suse.de>
-M:     Javier Martinez Canillas <javierm@redhat.com>
-L:     dri-devel@lists.freedesktop.org
+DRM DRIVER FOR SAMSUNG S6D7AA0 PANELS
+M:     Artur Weber <aweber.kernel@gmail.com>
 S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/drm_aperture.c
-F:     drivers/gpu/drm/tiny/ofdrm.c
-F:     drivers/gpu/drm/tiny/simpledrm.c
-F:     drivers/video/aperture.c
-F:     drivers/video/nomodeset.c
-F:     include/drm/drm_aperture.h
-F:     include/linux/aperture.h
-F:     include/video/nomodeset.h
+F:     Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml
+F:     drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c
 
 DRM DRIVER FOR SITRONIX ST7586 PANELS
 M:     David Lechner <david@lechnology.com>
@@ -6706,6 +6749,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 F:     drivers/gpu/drm/panel/panel-sitronix-st7701.c
 
+DRM DRIVER FOR SITRONIX ST7703 PANELS
+M:     Guido Günther <agx@sigxcpu.org>
+R:     Purism Kernel Team <kernel@puri.sm>
+R:     Ondrej Jirman <megous@megous.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
+F:     drivers/gpu/drm/panel/panel-sitronix-st7703.c
+
 DRM DRIVER FOR SITRONIX ST7735R PANELS
 M:     David Lechner <david@lechnology.com>
 S:     Maintained
@@ -6713,6 +6764,13 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
 F:     drivers/gpu/drm/tiny/st7735r.c
 
+DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
+M:     Javier Martinez Canillas <javierm@redhat.com>
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
+F:     drivers/gpu/drm/solomon/ssd130x*
+
 DRM DRIVER FOR ST-ERICSSON MCDE
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
@@ -6750,6 +6808,7 @@ F:        drivers/gpu/drm/udl/
 DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
 M:     Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
 M:     Melissa Wen <melissa.srw@gmail.com>
+M:     Maíra Canal <mairacanal@riseup.net>
 R:     Haneen Mohammed <hamohammed.sa@gmail.com>
 R:     Daniel Vetter <daniel@ffwll.ch>
 L:     dri-devel@lists.freedesktop.org
@@ -6811,25 +6870,6 @@ F:       include/drm/drm*
 F:     include/linux/vga*
 F:     include/uapi/drm/drm*
 
-DRM COMPUTE ACCELERATORS DRIVERS AND FRAMEWORK
-M:     Oded Gabbay <ogabbay@kernel.org>
-L:     dri-devel@lists.freedesktop.org
-S:     Maintained
-C:     irc://irc.oftc.net/dri-devel
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git
-F:     Documentation/accel/
-F:     drivers/accel/
-F:     include/drm/drm_accel.h
-
-DRM ACCEL DRIVERS FOR INTEL VPU
-M:     Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
-M:     Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
-L:     dri-devel@lists.freedesktop.org
-S:     Supported
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/accel/ivpu/
-F:     include/uapi/drm/ivpu_accel.h
-
 DRM DRIVERS FOR ALLWINNER A10
 M:     Maxime Ripard <mripard@kernel.org>
 M:     Chen-Yu Tsai <wens@csie.org>
@@ -6871,6 +6911,7 @@ S:        Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/bridge/
 F:     drivers/gpu/drm/bridge/
+F:     drivers/gpu/drm/drm_bridge.c
 F:     include/drm/drm_bridge.h
 
 DRM DRIVERS FOR EXYNOS
@@ -6933,14 +6974,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/hisilicon/
 F:     drivers/gpu/drm/hisilicon/
 
-DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE
-M:     Deepak Rawat <drawat.floss@gmail.com>
-L:     linux-hyperv@vger.kernel.org
-L:     dri-devel@lists.freedesktop.org
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/hyperv
-
 DRM DRIVERS FOR LIMA
 M:     Qiang Yu <yuq825@gmail.com>
 L:     dri-devel@lists.freedesktop.org
@@ -6987,8 +7020,7 @@ F:        Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml
 F:     Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
 F:     Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
 F:     Documentation/devicetree/bindings/display/renesas,du.yaml
-F:     drivers/gpu/drm/rcar-du/
-F:     drivers/gpu/drm/shmobile/
+F:     drivers/gpu/drm/renesas/
 F:     include/linux/platform_data/shmob_drm.h
 
 DRM DRIVERS FOR ROCKCHIP
@@ -7084,7 +7116,6 @@ F:        Documentation/gpu/xen-front.rst
 F:     drivers/gpu/drm/xen/
 
 DRM DRIVERS FOR XILINX
-M:     Hyun Kwon <hyun.kwon@xilinx.com>
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
@@ -7092,6 +7123,14 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/xlnx/
 F:     drivers/gpu/drm/xlnx/
 
+DRM GPU SCHEDULER
+M:     Luben Tuikov <luben.tuikov@amd.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/scheduler/
+F:     include/drm/gpu_scheduler.h
+
 DRM PANEL DRIVERS
 M:     Neil Armstrong <neil.armstrong@linaro.org>
 R:     Sam Ravnborg <sam@ravnborg.org>
@@ -7120,14 +7159,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     drivers/gpu/drm/ttm/
 F:     include/drm/ttm/
 
-DRM GPU SCHEDULER
-M:     Luben Tuikov <luben.tuikov@amd.com>
-L:     dri-devel@lists.freedesktop.org
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/scheduler/
-F:     include/drm/gpu_scheduler.h
-
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -7255,10 +7286,10 @@ F:      drivers/media/usb/dvb-usb-v2/usb_urb.c
 
 DYNAMIC DEBUG
 M:     Jason Baron <jbaron@akamai.com>
+M:     Jim Cromie <jim.cromie@gmail.com>
 S:     Maintained
 F:     include/linux/dynamic_debug.h
 F:     lib/dynamic_debug.c
-M:     Jim Cromie <jim.cromie@gmail.com>
 F:     lib/test_dynamic_debug.c
 
 DYNAMIC INTERRUPT MODERATION
@@ -7268,6 +7299,15 @@ F:       Documentation/networking/net_dim.rst
 F:     include/linux/dim.h
 F:     lib/dim/
 
+DYNAMIC THERMAL POWER MANAGEMENT (DTPM)
+M:     Daniel Lezcano <daniel.lezcano@kernel.org>
+L:     linux-pm@vger.kernel.org
+S:     Supported
+B:     https://bugzilla.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+F:     drivers/powercap/dtpm*
+F:     include/linux/dtpm.h
+
 DZ DECSTATION DZ11 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 S:     Maintained
@@ -7475,6 +7515,14 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/mpc85xx_edac.[ch]
 
+EDAC-NPCM
+M:     Marvin Lin <kflin@nuvoton.com>
+M:     Stanley Chu <yschu@nuvoton.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/memory-controllers/nuvoton,npcm-memory-controller.yaml
+F:     drivers/edac/npcm_edac.c
+
 EDAC-PASEMI
 M:     Egor Martovetsky <egor@pasemi.com>
 L:     linux-edac@vger.kernel.org
@@ -7606,22 +7654,22 @@ W:      http://www.broadcom.com
 F:     drivers/infiniband/hw/ocrdma/
 F:     include/uapi/rdma/ocrdma-abi.h
 
-EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
+EMULEX/BROADCOM EFCT FC/FCOE SCSI TARGET DRIVER
 M:     James Smart <james.smart@broadcom.com>
-M:     Dick Kennedy <dick.kennedy@broadcom.com>
+M:     Ram Vegesna <ram.vegesna@broadcom.com>
 L:     linux-scsi@vger.kernel.org
+L:     target-devel@vger.kernel.org
 S:     Supported
 W:     http://www.broadcom.com
-F:     drivers/scsi/lpfc/
+F:     drivers/scsi/elx/
 
-EMULEX/BROADCOM EFCT FC/FCOE SCSI TARGET DRIVER
+EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
 M:     James Smart <james.smart@broadcom.com>
-M:     Ram Vegesna <ram.vegesna@broadcom.com>
+M:     Dick Kennedy <dick.kennedy@broadcom.com>
 L:     linux-scsi@vger.kernel.org
-L:     target-devel@vger.kernel.org
 S:     Supported
 W:     http://www.broadcom.com
-F:     drivers/scsi/elx/
+F:     drivers/scsi/lpfc/
 
 ENE CB710 FLASH CARD READER DRIVER
 M:     Michał Mirosław <mirq-linux@rere.qmqm.pl>
@@ -7714,8 +7762,8 @@ F:        drivers/net/mdio/of_mdio.c
 F:     drivers/net/pcs/
 F:     drivers/net/phy/
 F:     include/dt-bindings/net/qca-ar803x.h
-F:     include/linux/linkmode.h
 F:     include/linux/*mdio*.h
+F:     include/linux/linkmode.h
 F:     include/linux/mdio/*.h
 F:     include/linux/mii.h
 F:     include/linux/of_net.h
@@ -7778,8 +7826,8 @@ M:        Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
-F:     security/integrity/evm/
 F:     security/integrity/
+F:     security/integrity/evm/
 
 EXTENSIBLE FIRMWARE INTERFACE (EFI)
 M:     Ard Biesheuvel <ardb@kernel.org>
@@ -7810,8 +7858,8 @@ EXTRA BOOT CONFIG
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/admin-guide/bootconfig.rst
 F:     fs/proc/bootconfig.c
@@ -7971,6 +8019,12 @@ S:       Maintained
 F:     drivers/hwmon/f75375s.c
 F:     include/linux/f75375s.h
 
+FINTEK F81604 USB to 2xCANBUS DEVICE DRIVER
+M:     Ji-Ze Hong (Peter Hong) <peter_hong@fintek.com.tw>
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     drivers/net/can/usb/f81604.c
+
 FIREWIRE AUDIO DRIVERS and IEC 61883-1/6 PACKET STREAMING ENGINE
 M:     Clemens Ladisch <clemens@ladisch.de>
 M:     Takashi Sakamoto <o-takashi@sakamocchi.jp>
@@ -8066,6 +8120,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/har
 F:     include/linux/fortify-string.h
 F:     lib/fortify_kunit.c
 F:     lib/memcpy_kunit.c
+F:     lib/strcat_kunit.c
 F:     lib/strscpy_kunit.c
 F:     lib/test_fortify/*
 F:     scripts/test_fortify.sh
@@ -8098,21 +8153,6 @@ F:       Documentation/fpga/
 F:     drivers/fpga/
 F:     include/linux/fpga/
 
-INTEL MAX10 BMC SECURE UPDATES
-M:     Russ Weight <russell.h.weight@intel.com>
-L:     linux-fpga@vger.kernel.org
-S:     Maintained
-F:     Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
-F:     drivers/fpga/intel-m10-bmc-sec-update.c
-
-MICROCHIP POLARFIRE FPGA DRIVERS
-M:     Conor Dooley <conor.dooley@microchip.com>
-R:     Ivan Bornyakov <i.bornyakov@metrotek.ru>
-L:     linux-fpga@vger.kernel.org
-S:     Supported
-F:     Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
-F:     drivers/fpga/microchip-spi.c
-
 FPU EMULATOR
 M:     Bill Metzenthen <billm@melbpc.org.au>
 S:     Maintained
@@ -8121,9 +8161,9 @@ F:        arch/x86/math-emu/
 
 FRAMEBUFFER CORE
 M:     Daniel Vetter <daniel@ffwll.ch>
-F:     drivers/video/fbdev/core/
 S:     Odd Fixes
 T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/video/fbdev/core/
 
 FRAMEBUFFER LAYER
 M:     Helge Deller <deller@gmx.de>
@@ -8178,6 +8218,7 @@ F:        include/linux/spi/spi-fsl-dspi.h
 
 FREESCALE ENETC ETHERNET DRIVERS
 M:     Claudiu Manoil <claudiu.manoil@nxp.com>
+M:     Vladimir Oltean <vladimir.oltean@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/freescale/enetc/
@@ -8500,15 +8541,15 @@ M:      Masami Hiramatsu <mhiramat@kernel.org>
 R:     Mark Rutland <mark.rutland@arm.com>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/ftrace*
-F:     kernel/trace/ftrace*
-F:     kernel/trace/fgraph.c
 F:     arch/*/*/*/*ftrace*
 F:     arch/*/*/*ftrace*
 F:     include/*/ftrace.h
+F:     kernel/trace/fgraph.c
+F:     kernel/trace/ftrace*
 F:     samples/ftrace
 
 FUNGIBLE ETHERNET DRIVERS
@@ -8549,10 +8590,10 @@ GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
 M:     Tim Harvey <tharvey@gateworks.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
-F:     drivers/mfd/gateworks-gsc.c
-F:     include/linux/mfd/gsc.h
 F:     Documentation/hwmon/gsc-hwmon.rst
 F:     drivers/hwmon/gsc-hwmon.c
+F:     drivers/mfd/gateworks-gsc.c
+F:     include/linux/mfd/gsc.h
 F:     include/linux/platform_data/gsc_hwmon.h
 
 GCC PLUGINS
@@ -8680,8 +8721,8 @@ R:        Andy Shevchenko <andy@kernel.org>
 S:     Maintained
 F:     lib/string.c
 F:     lib/string_helpers.c
-F:     lib/test_string.c
 F:     lib/test-string_helpers.c
+F:     lib/test_string.c
 
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:     "Michael S. Tsirkin" <mst@redhat.com>
@@ -8806,6 +8847,7 @@ F:        include/linux/gpio/regmap.h
 GPIO SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 M:     Bartosz Golaszewski <brgl@bgdev.pl>
+R:     Andy Shevchenko <andy@kernel.org>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@ -9164,12 +9206,17 @@ L:      linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/hid/hid-logitech-*
 
-HID++ LOGITECH DRIVERS
-R:     Filipe Laíns <lains@riseup.net>
-R:     Bastien Nocera <hadess@hadess.net>
+HID PHOENIX RC FLIGHT CONTROLLER
+M:     Marcus Folkesson <marcus.folkesson@gmail.com>
 L:     linux-input@vger.kernel.org
 S:     Maintained
-F:     drivers/hid/hid-logitech-hidpp.c
+F:     drivers/hid/hid-pxrc.c
+
+HID NVIDIA SHIELD DRIVER
+M:     Rahul Rameshbabu <rrameshbabu@nvidia.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-nvidia-shield.c
 
 HID PLAYSTATION DRIVER
 M:     Roderick Colenbrander <roderick.colenbrander@sony.com>
@@ -9177,12 +9224,6 @@ L:       linux-input@vger.kernel.org
 S:     Supported
 F:     drivers/hid/hid-playstation.c
 
-HID PHOENIX RC FLIGHT CONTROLLER
-M:     Marcus Folkesson <marcus.folkesson@gmail.com>
-L:     linux-input@vger.kernel.org
-S:     Maintained
-F:     drivers/hid/hid-pxrc.c
-
 HID SENSOR HUB DRIVERS
 M:     Jiri Kosina <jikos@kernel.org>
 M:     Jonathan Cameron <jic23@kernel.org>
@@ -9209,6 +9250,13 @@ S:       Maintained
 F:     drivers/hid/wacom.h
 F:     drivers/hid/wacom_*
 
+HID++ LOGITECH DRIVERS
+R:     Filipe Laíns <lains@riseup.net>
+R:     Bastien Nocera <hadess@hadess.net>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-logitech-hidpp.c
+
 HIGH-RESOLUTION TIMERS, CLOCKEVENTS
 M:     Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
@@ -9233,6 +9281,12 @@ W:       http://www.highpoint-tech.com
 F:     Documentation/scsi/hptiop.rst
 F:     drivers/scsi/hptiop.c
 
+HIKEY960 ONBOARD USB GPIO HUB DRIVER
+M:     John Stultz <jstultz@google.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/misc/hisi_hikey_usb.c
+
 HIMAX HX83112B TOUCHSCREEN SUPPORT
 M:     Job Noorman <job@noorman.info>
 L:     linux-input@vger.kernel.org
@@ -9281,6 +9335,12 @@ F:       drivers/crypto/hisilicon/hpre/hpre.h
 F:     drivers/crypto/hisilicon/hpre/hpre_crypto.c
 F:     drivers/crypto/hisilicon/hpre/hpre_main.c
 
+HISILICON HNS3 PMU DRIVER
+M:     Guangbin Huang <huangguangbin2@huawei.com>
+S:     Supported
+F:     Documentation/admin-guide/perf/hns3-pmu.rst
+F:     drivers/perf/hisilicon/hns3_pmu.c
+
 HISILICON I2C CONTROLLER DRIVER
 M:     Yicong Yang <yangyicong@hisilicon.com>
 L:     linux-i2c@vger.kernel.org
@@ -9313,12 +9373,6 @@ W:       http://www.hisilicon.com
 F:     Documentation/devicetree/bindings/net/hisilicon*.txt
 F:     drivers/net/ethernet/hisilicon/
 
-HIKEY960 ONBOARD USB GPIO HUB DRIVER
-M:     John Stultz <jstultz@google.com>
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-F:     drivers/misc/hisi_hikey_usb.c
-
 HISILICON PMU DRIVER
 M:     Shaokun Zhang <zhangshaokun@hisilicon.com>
 M:     Jonathan Cameron <jonathan.cameron@huawei.com>
@@ -9328,12 +9382,6 @@ F:       Documentation/admin-guide/perf/hisi-pcie-pmu.rst
 F:     Documentation/admin-guide/perf/hisi-pmu.rst
 F:     drivers/perf/hisilicon
 
-HISILICON HNS3 PMU DRIVER
-M:     Guangbin Huang <huangguangbin2@huawei.com>
-S:     Supported
-F:     Documentation/admin-guide/perf/hns3-pmu.rst
-F:     drivers/perf/hisilicon/hns3_pmu.c
-
 HISILICON PTT DRIVER
 M:     Yicong Yang <yangyicong@hisilicon.com>
 M:     Jonathan Cameron <jonathan.cameron@huawei.com>
@@ -9357,17 +9405,9 @@ F:       drivers/crypto/hisilicon/qm.c
 F:     drivers/crypto/hisilicon/sgl.c
 F:     include/linux/hisi_acc_qm.h
 
-HISILICON ZIP Controller DRIVER
-M:     Yang Shen <shenyang39@huawei.com>
-M:     Zhou Wang <wangzhou1@hisilicon.com>
-L:     linux-crypto@vger.kernel.org
-S:     Maintained
-F:     Documentation/ABI/testing/debugfs-hisi-zip
-F:     drivers/crypto/hisilicon/zip/
-
 HISILICON ROCE DRIVER
 M:     Haoyue Xu <xuhaoyue1@hisilicon.com>
-M:     Wenpeng Liang <liangwenpeng@huawei.com>
+M:     Junxian Huang <huangjunxian6@hisilicon.com>
 L:     linux-rdma@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
@@ -9423,6 +9463,14 @@ S:       Maintained
 W:     http://www.hisilicon.com
 F:     drivers/spi/spi-hisi-sfc-v3xx.c
 
+HISILICON ZIP Controller DRIVER
+M:     Yang Shen <shenyang39@huawei.com>
+M:     Zhou Wang <wangzhou1@hisilicon.com>
+L:     linux-crypto@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/debugfs-hisi-zip
+F:     drivers/crypto/hisilicon/zip/
+
 HMM - Heterogeneous Memory Management
 M:     Jérôme Glisse <jglisse@redhat.com>
 L:     linux-mm@kvack.org
@@ -9445,6 +9493,13 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Orphan
 F:     drivers/platform/x86/hp/tc1100-wmi.c
 
+HP WMI HARDWARE MONITOR DRIVER
+M:     James Seo <james@equiv.tech>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/hp-wmi-sensors.rst
+F:     drivers/hwmon/hp-wmi-sensors.c
+
 HPET:  High Precision Event Timers driver
 M:     Clemens Ladisch <clemens@ladisch.de>
 S:     Maintained
@@ -9499,9 +9554,9 @@ F:        drivers/input/touchscreen/htcpen.c
 HTE SUBSYSTEM
 M:     Dipen Patel <dipenp@nvidia.com>
 L:     timestamp@lists.linux.dev
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git
-Q:     https://patchwork.kernel.org/project/timestamp/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/timestamp/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git
 F:     Documentation/devicetree/bindings/timestamp/
 F:     Documentation/driver-api/hte/
 F:     drivers/hte/
@@ -9596,8 +9651,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 F:     Documentation/ABI/testing/debugfs-hyperv
 F:     Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml
-F:     Documentation/virt/hyperv
 F:     Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
+F:     Documentation/virt/hyperv
 F:     arch/arm64/hyperv
 F:     arch/arm64/include/asm/hyperv-tlfs.h
 F:     arch/arm64/include/asm/mshyperv.h
@@ -9702,8 +9757,9 @@ F:        include/uapi/linux/i2c-*.h
 F:     include/uapi/linux/i2c.h
 
 I2C SUBSYSTEM HOST DRIVERS
+M:     Andi Shyti <andi.shyti@kernel.org>
 L:     linux-i2c@vger.kernel.org
-S:     Odd Fixes
+S:     Maintained
 W:     https://i2c.wiki.kernel.org/
 Q:     https://patchwork.ozlabs.org/project/linux-i2c/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
@@ -9779,6 +9835,12 @@ L:       linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/i2c-stub.c
 
+I3C DRIVER FOR ASPEED AST2600
+M:     Jeremy Kerr <jk@codeconstruct.com.au>
+S:     Maintained
+F:     Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml
+F:     drivers/i3c/master/ast2600-i3c-master.c
+
 I3C DRIVER FOR CADENCE I3C MASTER IP
 M:     Przemysław Gaj <pgaj@cadence.com>
 S:     Maintained
@@ -9790,12 +9852,6 @@ S:       Orphan
 F:     Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
 F:     drivers/i3c/master/dw*
 
-I3C DRIVER FOR ASPEED AST2600
-M:     Jeremy Kerr <jk@codeconstruct.com.au>
-S:     Maintained
-F:     Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml
-F:     drivers/i3c/master/ast2600-i3c-master.c
-
 I3C SUBSYSTEM
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
 L:     linux-i3c@lists.infradead.org (moderated for non-subscribers)
@@ -9874,6 +9930,11 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmvnic.*
 
+IBM Power VFIO Support
+M:     Timothy Pearson <tpearson@raptorengineering.com>
+S:     Supported
+F:     drivers/vfio/vfio_iommu_spapr_tce.c
+
 IBM Power Virtual Ethernet Device Driver
 M:     Nick Child <nnac123@linux.ibm.com>
 L:     netdev@vger.kernel.org
@@ -9919,11 +9980,6 @@ F:       drivers/crypto/vmx/ghash*
 F:     drivers/crypto/vmx/ppc-xlate.pl
 F:     drivers/crypto/vmx/vmx.c
 
-IBM Power VFIO Support
-M:     Timothy Pearson <tpearson@raptorengineering.com>
-S:     Supported
-F:     drivers/vfio/vfio_iommu_spapr_tce.c
-
 IBM ServeRAID RAID DRIVER
 S:     Orphan
 F:     drivers/scsi/ips.*
@@ -9977,8 +10033,9 @@ M:       Miquel Raynal <miquel.raynal@bootlin.com>
 L:     linux-wpan@vger.kernel.org
 S:     Maintained
 W:     https://linux-wpan.org/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git
+Q:     https://patchwork.kernel.org/project/linux-wpan/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git
 F:     Documentation/networking/ieee802154.rst
 F:     drivers/net/ieee802154/
 F:     include/linux/ieee802154.h
@@ -9991,6 +10048,10 @@ F:      include/net/nl802154.h
 F:     net/ieee802154/
 F:     net/mac802154/
 
+IFCVF VIRTIO DATA PATH ACCELERATOR
+R:     Zhu Lingshan <lingshan.zhu@intel.com>
+F:     drivers/vdpa/ifcvf/
+
 IFE PROTOCOL
 M:     Yotam Gigi <yotam.gi@gmail.com>
 M:     Jamal Hadi Salim <jhs@mojatatu.com>
@@ -10126,7 +10187,7 @@ S:      Maintained
 F:     Documentation/process/kernel-docs.rst
 
 INDUSTRY PACK SUBSYSTEM (IPACK)
-M:     Samuel Iglesias Gonsalvez <siglesias@igalia.com>
+M:     Vaibhav Gupta <vaibhavgupta40@gmail.com>
 M:     Jens Taprogge <jens.taprogge@taprogge.org>
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     industrypack-devel@lists.sourceforge.net
@@ -10255,8 +10316,8 @@ M:      Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 L:     linux-integrity@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
-F:     security/integrity/ima/
 F:     security/integrity/
+F:     security/integrity/ima/
 
 INTEL 810/815 FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
@@ -10346,9 +10407,8 @@ M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
 M:     Tony Nguyen <anthony.l.nguyen@intel.com>
 L:     intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
 S:     Supported
-W:     http://www.intel.com/support/feedback.htm
-W:     http://e1000.sourceforge.net/
-Q:     http://patchwork.ozlabs.org/project/intel-wired-lan/list/
+W:     https://www.intel.com/content/www/us/en/support.html
+Q:     https://patchwork.ozlabs.org/project/intel-wired-lan/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git
 F:     Documentation/networking/device_drivers/ethernet/intel/
@@ -10410,14 +10470,6 @@ S:     Supported
 Q:     https://patchwork.kernel.org/project/linux-dmaengine/list/
 F:     drivers/dma/ioat*
 
-INTEL IDXD DRIVER
-M:     Fenghua Yu <fenghua.yu@intel.com>
-M:     Dave Jiang <dave.jiang@intel.com>
-L:     dmaengine@vger.kernel.org
-S:     Supported
-F:     drivers/dma/idxd/*
-F:     include/uapi/linux/idxd.h
-
 INTEL IDLE DRIVER
 M:     Jacob Pan <jacob.jun.pan@linux.intel.com>
 M:     Len Brown <lenb@kernel.org>
@@ -10427,6 +10479,14 @@ B:     https://bugzilla.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
 F:     drivers/idle/intel_idle.c
 
+INTEL IDXD DRIVER
+M:     Fenghua Yu <fenghua.yu@intel.com>
+M:     Dave Jiang <dave.jiang@intel.com>
+L:     dmaengine@vger.kernel.org
+S:     Supported
+F:     drivers/dma/idxd/*
+F:     include/uapi/linux/idxd.h
+
 INTEL IN FIELD SCAN (IFS) DEVICE
 M:     Jithu Joseph <jithu.joseph@intel.com>
 R:     Ashok Raj <ashok.raj@intel.com>
@@ -10473,18 +10533,18 @@ F:    Documentation/admin-guide/media/ipu3_rcb.svg
 F:     Documentation/userspace-api/media/v4l/pixfmt-meta-intel-ipu3.rst
 F:     drivers/staging/media/ipu3/
 
-INTEL IXP4XX CRYPTO SUPPORT
-M:     Corentin Labbe <clabbe@baylibre.com>
-L:     linux-crypto@vger.kernel.org
-S:     Maintained
-F:     drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
-
 INTEL ISHTP ECLITE DRIVER
 M:     Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/x86/intel/ishtp_eclite.c
 
+INTEL IXP4XX CRYPTO SUPPORT
+M:     Corentin Labbe <clabbe@baylibre.com>
+L:     linux-crypto@vger.kernel.org
+S:     Maintained
+F:     drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
+
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 M:     Krzysztof Halasa <khalasa@piap.pl>
 S:     Maintained
@@ -10563,6 +10623,13 @@ F:     drivers/hwmon/intel-m10-bmc-hwmon.c
 F:     drivers/mfd/intel-m10-bmc*
 F:     include/linux/mfd/intel-m10-bmc.h
 
+INTEL MAX10 BMC SECURE UPDATES
+M:     Russ Weight <russell.h.weight@intel.com>
+L:     linux-fpga@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
+F:     drivers/fpga/intel-m10-bmc-sec-update.c
+
 INTEL P-Unit IPC DRIVER
 M:     Zha Qipeng <qipeng.zha@intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -10610,6 +10677,13 @@ L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     drivers/cpufreq/intel_pstate.c
 
+INTEL PTP DFL ToD DRIVER
+M:     Tianfei Zhang <tianfei.zhang@intel.com>
+L:     linux-fpga@vger.kernel.org
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/ptp/ptp_dfl_tod.c
+
 INTEL QUADRATURE ENCODER PERIPHERAL DRIVER
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
 L:     linux-iio@vger.kernel.org
@@ -10628,6 +10702,21 @@ F:     drivers/platform/x86/intel/sdsi.c
 F:     tools/arch/x86/intel_sdsi/
 F:     tools/testing/selftests/drivers/sdsi/
 
+INTEL SGX
+M:     Jarkko Sakkinen <jarkko@kernel.org>
+R:     Dave Hansen <dave.hansen@linux.intel.com>
+L:     linux-sgx@vger.kernel.org
+S:     Supported
+Q:     https://patchwork.kernel.org/project/intel-sgx/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
+F:     Documentation/arch/x86/sgx.rst
+F:     arch/x86/entry/vdso/vsgx.S
+F:     arch/x86/include/asm/sgx.h
+F:     arch/x86/include/uapi/asm/sgx.h
+F:     arch/x86/kernel/cpu/sgx/*
+F:     tools/testing/selftests/sgx/*
+K:     \bSGX_
+
 INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
 M:     Daniel Scally <djrscally@gmail.com>
 S:     Maintained
@@ -10645,13 +10734,13 @@ INTEL STRATIX10 FIRMWARE DRIVERS
 M:     Dinh Nguyen <dinguyen@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
 F:     Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
 F:     Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
 F:     drivers/firmware/stratix10-rsu.c
 F:     drivers/firmware/stratix10-svc.c
 F:     include/linux/firmware/intel/stratix10-smc.h
 F:     include/linux/firmware/intel/stratix10-svc-client.h
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
 
 INTEL TELEMETRY DRIVER
 M:     Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
@@ -10736,21 +10825,6 @@ F:     Documentation/arch/x86/intel_txt.rst
 F:     arch/x86/kernel/tboot.c
 F:     include/linux/tboot.h
 
-INTEL SGX
-M:     Jarkko Sakkinen <jarkko@kernel.org>
-R:     Dave Hansen <dave.hansen@linux.intel.com>
-L:     linux-sgx@vger.kernel.org
-S:     Supported
-Q:     https://patchwork.kernel.org/project/intel-sgx/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
-F:     Documentation/arch/x86/sgx.rst
-F:     arch/x86/entry/vdso/vsgx.S
-F:     arch/x86/include/asm/sgx.h
-F:     arch/x86/include/uapi/asm/sgx.h
-F:     arch/x86/kernel/cpu/sgx/*
-F:     tools/testing/selftests/sgx/*
-K:     \bSGX_
-
 INTERCONNECT API
 M:     Georgi Djakov <djakov@kernel.org>
 L:     linux-pm@vger.kernel.org
@@ -10819,18 +10893,6 @@ F:     drivers/iommu/dma-iommu.h
 F:     drivers/iommu/iova.c
 F:     include/linux/iova.h
 
-IOMMUFD
-M:     Jason Gunthorpe <jgg@nvidia.com>
-M:     Kevin Tian <kevin.tian@intel.com>
-L:     iommu@lists.linux.dev
-S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
-F:     Documentation/userspace-api/iommufd.rst
-F:     drivers/iommu/iommufd/
-F:     include/linux/iommufd.h
-F:     include/uapi/linux/iommufd.h
-F:     tools/testing/selftests/iommu/
-
 IOMMU SUBSYSTEM
 M:     Joerg Roedel <joro@8bytes.org>
 M:     Will Deacon <will@kernel.org>
@@ -10846,6 +10908,18 @@ F:     include/linux/iova.h
 F:     include/linux/of_iommu.h
 F:     include/uapi/linux/iommu.h
 
+IOMMUFD
+M:     Jason Gunthorpe <jgg@nvidia.com>
+M:     Kevin Tian <kevin.tian@intel.com>
+L:     iommu@lists.linux.dev
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
+F:     Documentation/userspace-api/iommufd.rst
+F:     drivers/iommu/iommufd/
+F:     include/linux/iommufd.h
+F:     include/uapi/linux/iommufd.h
+F:     tools/testing/selftests/iommu/
+
 IOSYS-MAP HELPERS
 M:     Thomas Zimmermann <tzimmermann@suse.de>
 L:     dri-devel@lists.freedesktop.org
@@ -10860,11 +10934,11 @@ L:    io-uring@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.dk/linux-block
 T:     git git://git.kernel.dk/liburing
-F:     io_uring/
 F:     include/linux/io_uring.h
 F:     include/linux/io_uring_types.h
 F:     include/trace/events/io_uring.h
 F:     include/uapi/linux/io_uring.h
+F:     io_uring/
 F:     tools/io_uring/
 
 IPMI SUBSYSTEM
@@ -10873,8 +10947,8 @@ L:      openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
 S:     Supported
 W:     http://openipmi.sourceforge.net/
 T:     git https://github.com/cminyard/linux-ipmi.git for-next
-F:     Documentation/driver-api/ipmi.rst
 F:     Documentation/devicetree/bindings/ipmi/
+F:     Documentation/driver-api/ipmi.rst
 F:     drivers/char/ipmi/
 F:     include/linux/ipmi*
 F:     include/uapi/linux/ipmi*
@@ -10926,8 +11000,8 @@ M:      Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
-F:     kernel/irq/
 F:     include/linux/group_cpus.h
+F:     kernel/irq/
 F:     lib/group_cpus.c
 
 IRQCHIP DRIVERS
@@ -11261,10 +11335,15 @@ W:    http://kernelnewbies.org/KernelJanitors
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 M:     Chuck Lever <chuck.lever@oracle.com>
 M:     Jeff Layton <jlayton@kernel.org>
+R:     Neil Brown <neilb@suse.de>
+R:     Olga Kornievskaia <kolga@netapp.com>
+R:     Dai Ngo <Dai.Ngo@oracle.com>
+R:     Tom Talpey <tom@talpey.com>
 L:     linux-nfs@vger.kernel.org
 S:     Supported
 W:     http://nfs.sourceforge.net/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
+F:     Documentation/filesystems/nfs/
 F:     fs/exportfs/
 F:     fs/lockd/
 F:     fs/nfs_common/
@@ -11280,7 +11359,6 @@ F:      include/trace/misc/sunrpc.h
 F:     include/uapi/linux/nfsd/
 F:     include/uapi/linux/sunrpc/
 F:     net/sunrpc/
-F:     Documentation/filesystems/nfs/
 
 KERNEL REGRESSIONS
 M:     Thorsten Leemhuis <linux@leemhuis.info>
@@ -11307,9 +11385,9 @@ R:      Tom Talpey <tom@talpey.com>
 L:     linux-cifs@vger.kernel.org
 S:     Maintained
 T:     git git://git.samba.org/ksmbd.git
-F:     Documentation/filesystems/cifs/ksmbd.rst
-F:     fs/ksmbd/
-F:     fs/smbfs_common/
+F:     Documentation/filesystems/smb/ksmbd.rst
+F:     fs/smb/common/
+F:     fs/smb/server/
 
 KERNEL UNIT TESTING FRAMEWORK (KUnit)
 M:     Brendan Higgins <brendanhiggins@google.com>
@@ -11318,6 +11396,8 @@ L:      linux-kselftest@vger.kernel.org
 L:     kunit-dev@googlegroups.com
 S:     Maintained
 W:     https://google.github.io/kunit-docs/third_party/kernel/docs/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes
 F:     Documentation/dev-tools/kunit/
 F:     include/kunit/
 F:     lib/kunit/
@@ -11366,7 +11446,6 @@ F:      tools/testing/selftests/kvm/aarch64/
 
 KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
 M:     Huacai Chen <chenhuacai@kernel.org>
-M:     Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
 L:     linux-mips@vger.kernel.org
 L:     kvm@vger.kernel.org
 S:     Maintained
@@ -11376,7 +11455,13 @@ F:     arch/mips/include/uapi/asm/kvm*
 F:     arch/mips/kvm/
 
 KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
+M:     Michael Ellerman <mpe@ellerman.id.au>
+R:     Nicholas Piggin <npiggin@gmail.com>
 L:     linuxppc-dev@lists.ozlabs.org
+L:     kvm@vger.kernel.org
+S:     Maintained (Book3S 64-bit HV)
+S:     Odd fixes (Book3S 64-bit PR)
+S:     Orphan (Book3E and 32-bit)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm
 F:     arch/powerpc/include/asm/kvm*
 F:     arch/powerpc/include/uapi/asm/kvm*
@@ -11432,47 +11517,6 @@ F:     arch/x86/include/uapi/asm/vmx.h
 F:     arch/x86/kvm/
 F:     arch/x86/kvm/*/
 
-KVM PARAVIRT (KVM/paravirt)
-M:     Paolo Bonzini <pbonzini@redhat.com>
-R:     Wanpeng Li <wanpengli@tencent.com>
-R:     Vitaly Kuznetsov <vkuznets@redhat.com>
-L:     kvm@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-F:     arch/x86/kernel/kvm.c
-F:     arch/x86/kernel/kvmclock.c
-F:     arch/x86/include/asm/pvclock-abi.h
-F:     include/linux/kvm_para.h
-F:     include/uapi/linux/kvm_para.h
-F:     include/uapi/asm-generic/kvm_para.h
-F:     include/asm-generic/kvm_para.h
-F:     arch/um/include/asm/kvm_para.h
-F:     arch/x86/include/asm/kvm_para.h
-F:     arch/x86/include/uapi/asm/kvm_para.h
-
-KVM X86 HYPER-V (KVM/hyper-v)
-M:     Vitaly Kuznetsov <vkuznets@redhat.com>
-M:     Sean Christopherson <seanjc@google.com>
-M:     Paolo Bonzini <pbonzini@redhat.com>
-L:     kvm@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-F:     arch/x86/kvm/hyperv.*
-F:     arch/x86/kvm/kvm_onhyperv.*
-F:     arch/x86/kvm/svm/hyperv.*
-F:     arch/x86/kvm/svm/svm_onhyperv.*
-F:     arch/x86/kvm/vmx/hyperv.*
-
-KVM X86 Xen (KVM/Xen)
-M:     David Woodhouse <dwmw2@infradead.org>
-M:     Paul Durrant <paul@xen.org>
-M:     Sean Christopherson <seanjc@google.com>
-M:     Paolo Bonzini <pbonzini@redhat.com>
-L:     kvm@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-F:     arch/x86/kvm/xen.*
-
 KERNFS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:     Tejun Heo <tj@kernel.org>
@@ -11511,14 +11555,6 @@ F:     include/keys/trusted-type.h
 F:     include/keys/trusted_tpm.h
 F:     security/keys/trusted-keys/
 
-KEYS-TRUSTED-TEE
-M:     Sumit Garg <sumit.garg@linaro.org>
-L:     linux-integrity@vger.kernel.org
-L:     keyrings@vger.kernel.org
-S:     Supported
-F:     include/keys/trusted_tee.h
-F:     security/keys/trusted-keys/trusted_tee.c
-
 KEYS-TRUSTED-CAAM
 M:     Ahmad Fatoum <a.fatoum@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
@@ -11528,6 +11564,14 @@ S:     Maintained
 F:     include/keys/trusted_caam.h
 F:     security/keys/trusted-keys/trusted_caam.c
 
+KEYS-TRUSTED-TEE
+M:     Sumit Garg <sumit.garg@linaro.org>
+L:     linux-integrity@vger.kernel.org
+L:     keyrings@vger.kernel.org
+S:     Supported
+F:     include/keys/trusted_tee.h
+F:     security/keys/trusted-keys/trusted_tee.c
+
 KEYS/KEYRINGS
 M:     David Howells <dhowells@redhat.com>
 M:     Jarkko Sakkinen <jarkko@kernel.org>
@@ -11590,8 +11634,8 @@ L:      linux-amlogic@lists.infradead.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
 F:     drivers/mfd/khadas-mcu.c
-F:     include/linux/mfd/khadas-mcu.h
 F:     drivers/thermal/khadas_mcu_fan.c
+F:     include/linux/mfd/khadas-mcu.h
 
 KIONIX/ROHM KX022A ACCELEROMETER
 M:     Matti Vaittinen <mazziesaccount@gmail.com>
@@ -11628,8 +11672,8 @@ M:      "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/kprobes.rst
 F:     include/asm-generic/kprobes.h
@@ -11663,6 +11707,47 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml
 F:     drivers/video/backlight/ktz8866.c
 
+KVM PARAVIRT (KVM/paravirt)
+M:     Paolo Bonzini <pbonzini@redhat.com>
+R:     Wanpeng Li <wanpengli@tencent.com>
+R:     Vitaly Kuznetsov <vkuznets@redhat.com>
+L:     kvm@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:     arch/um/include/asm/kvm_para.h
+F:     arch/x86/include/asm/kvm_para.h
+F:     arch/x86/include/asm/pvclock-abi.h
+F:     arch/x86/include/uapi/asm/kvm_para.h
+F:     arch/x86/kernel/kvm.c
+F:     arch/x86/kernel/kvmclock.c
+F:     include/asm-generic/kvm_para.h
+F:     include/linux/kvm_para.h
+F:     include/uapi/asm-generic/kvm_para.h
+F:     include/uapi/linux/kvm_para.h
+
+KVM X86 HYPER-V (KVM/hyper-v)
+M:     Vitaly Kuznetsov <vkuznets@redhat.com>
+M:     Sean Christopherson <seanjc@google.com>
+M:     Paolo Bonzini <pbonzini@redhat.com>
+L:     kvm@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:     arch/x86/kvm/hyperv.*
+F:     arch/x86/kvm/kvm_onhyperv.*
+F:     arch/x86/kvm/svm/hyperv.*
+F:     arch/x86/kvm/svm/svm_onhyperv.*
+F:     arch/x86/kvm/vmx/hyperv.*
+
+KVM X86 Xen (KVM/Xen)
+M:     David Woodhouse <dwmw2@infradead.org>
+M:     Paul Durrant <paul@xen.org>
+M:     Sean Christopherson <seanjc@google.com>
+M:     Paolo Bonzini <pbonzini@redhat.com>
+L:     kvm@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:     arch/x86/kvm/xen.*
+
 L3MDEV
 M:     David Ahern <dsahern@kernel.org>
 L:     netdev@vger.kernel.org
@@ -11738,7 +11823,7 @@ LEGO MINDSTORMS EV3
 R:     David Lechner <david@lechnology.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml
-F:     arch/arm/boot/dts/da850-lego-ev3.dts
+F:     arch/arm/boot/dts/ti/davinci/da850-lego-ev3.dts
 F:     drivers/power/supply/lego_ev3_battery.c
 
 LEGO USB Tower driver
@@ -11904,16 +11989,17 @@ F:    scripts/spdxexclude
 LINEAR RANGES HELPERS
 M:     Mark Brown <broonie@kernel.org>
 R:     Matti Vaittinen <mazziesaccount@gmail.com>
+F:     include/linux/linear_range.h
 F:     lib/linear_ranges.c
 F:     lib/test_linear_ranges.c
-F:     include/linux/linear_range.h
 
 LINUX FOR POWER MACINTOSH
-M:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
 L:     linuxppc-dev@lists.ozlabs.org
-S:     Odd Fixes
+S:     Orphan
 F:     arch/powerpc/platforms/powermac/
 F:     drivers/macintosh/
+X:     drivers/macintosh/adb-iop.c
+X:     drivers/macintosh/via-macii.c
 
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:     Michael Ellerman <mpe@ellerman.id.au>
@@ -12033,11 +12119,11 @@ M:    Joel Stanley <joel@jms.id.au>
 S:     Maintained
 F:     Documentation/devicetree/bindings/*/litex,*.yaml
 F:     arch/openrisc/boot/dts/or1klitex.dts
-F:     include/linux/litex.h
-F:     drivers/tty/serial/liteuart.c
-F:     drivers/soc/litex/*
-F:     drivers/net/ethernet/litex/*
 F:     drivers/mmc/host/litex_mmc.c
+F:     drivers/net/ethernet/litex/*
+F:     drivers/soc/litex/*
+F:     drivers/tty/serial/liteuart.c
+F:     include/linux/litex.h
 N:     litex
 
 LIVE PATCHING
@@ -12166,10 +12252,17 @@ R:    WANG Xuerui <kernel@xen0n.name>
 L:     loongarch@lists.linux.dev
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
-F:     arch/loongarch/
-F:     drivers/*/*loongarch*
 F:     Documentation/loongarch/
 F:     Documentation/translations/zh_CN/loongarch/
+F:     arch/loongarch/
+F:     drivers/*/*loongarch*
+
+LOONGSON GPIO DRIVER
+M:     Yinbo Zhu <zhuyinbo@loongson.cn>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
+F:     drivers/gpio/gpio-loongson-64bit.c
 
 LOONGSON LS2X I2C DRIVER
 M:     Binbin Zhou <zhoubinbin@loongson.cn>
@@ -12178,6 +12271,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/loongson,ls2x-i2c.yaml
 F:     drivers/i2c/busses/i2c-ls2x.c
 
+LOONGSON-2 SOC SERIES CLOCK DRIVER
+M:     Yinbo Zhu <zhuyinbo@loongson.cn>
+L:     linux-clk@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml
+F:     drivers/clk/clk-loongson2.c
+F:     include/dt-bindings/clock/loongson,ls2k-clk.h
+
 LOONGSON-2 SOC SERIES GUTS DRIVER
 M:     Yinbo Zhu <zhuyinbo@loongson.cn>
 L:     loongarch@lists.linux.dev
@@ -12193,21 +12294,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
 F:     drivers/pinctrl/pinctrl-loongson2.c
 
-LOONGSON GPIO DRIVER
-M:     Yinbo Zhu <zhuyinbo@loongson.cn>
-L:     linux-gpio@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
-F:     drivers/gpio/gpio-loongson-64bit.c
-
-LOONGSON-2 SOC SERIES CLOCK DRIVER
-M:     Yinbo Zhu <zhuyinbo@loongson.cn>
-L:     linux-clk@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml
-F:     drivers/clk/clk-loongson2.c
-F:     include/dt-bindings/clock/loongson,ls2k-clk.h
-
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 M:     Sathya Prakash <sathya.prakash@broadcom.com>
 M:     Sreekanth Reddy <sreekanth.reddy@broadcom.com>
@@ -12368,20 +12454,26 @@ MAILBOX API
 M:     Jassi Brar <jassisinghbrar@gmail.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/mailbox/
 F:     drivers/mailbox/
+F:     include/dt-bindings/mailbox/
 F:     include/linux/mailbox_client.h
 F:     include/linux/mailbox_controller.h
-F:     include/dt-bindings/mailbox/
-F:     Documentation/devicetree/bindings/mailbox/
 
 MAILBOX ARM MHUv2
 M:     Viresh Kumar <viresh.kumar@linaro.org>
 M:     Tushar Khandelwal <Tushar.Khandelwal@arm.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
 F:     drivers/mailbox/arm_mhuv2.c
 F:     include/linux/mailbox/arm_mhuv2_message.h
-F:     Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
+
+MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
+M:     Michael Kerrisk <mtk.manpages@gmail.com>
+L:     linux-man@vger.kernel.org
+S:     Maintained
+W:     http://www.kernel.org/doc/man-pages
 
 MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
 M:     Jeremy Kerr <jk@codeconstruct.com.au>
@@ -12395,12 +12487,6 @@ F:     include/net/mctpdevice.h
 F:     include/net/netns/mctp.h
 F:     net/mctp/
 
-MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
-M:     Michael Kerrisk <mtk.manpages@gmail.com>
-L:     linux-man@vger.kernel.org
-S:     Maintained
-W:     http://www.kernel.org/doc/man-pages
-
 MAPLE TREE
 M:     Liam R. Howlett <Liam.Howlett@oracle.com>
 L:     linux-mm@kvack.org
@@ -12432,8 +12518,8 @@ F:      include/linux/platform_data/mv88e6xxx.h
 MARVELL ARMADA 3700 PHY DRIVERS
 M:     Miquel Raynal <miquel.raynal@bootlin.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
 F:     Documentation/devicetree/bindings/phy/marvell,armada-3700-utmi-phy.yaml
+F:     Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
 F:     drivers/phy/marvell/phy-mvebu-a3700-comphy.c
 F:     drivers/phy/marvell/phy-mvebu-a3700-utmi.c
 
@@ -12532,9 +12618,15 @@ MARVELL NAND CONTROLLER DRIVER
 M:     Miquel Raynal <miquel.raynal@bootlin.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/mtd/marvell-nand.txt
 F:     drivers/mtd/nand/raw/marvell_nand.c
 
+MARVELL OCTEON ENDPOINT DRIVER
+M:     Veerasenareddy Burru <vburru@marvell.com>
+M:     Sathesh Edara <sedara@marvell.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/marvell/octeon_ep
+
 MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
 M:     Sunil Goutham <sgoutham@marvell.com>
 M:     Geetha sowjanya <gakula@marvell.com>
@@ -12582,13 +12674,6 @@ S:     Supported
 F:     Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
 F:     drivers/mmc/host/sdhci-xenon*
 
-MARVELL OCTEON ENDPOINT DRIVER
-M:     Veerasenareddy Burru <vburru@marvell.com>
-M:     Abhijit Ayarekar <aayarekar@marvell.com>
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     drivers/net/ethernet/marvell/octeon_ep
-
 MATROX FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
@@ -12619,6 +12704,15 @@ F:     Documentation/userspace-api/media/drivers/max2175.rst
 F:     drivers/media/i2c/max2175*
 F:     include/uapi/linux/max2175.h
 
+MAX31827 TEMPERATURE SWITCH DRIVER
+M:     Daniel Matyas <daniel.matyas@analog.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Supported
+W:     http://ez.analog.com/community/linux-device-drivers
+F:     Documentation/devicetree/bindings/hwmon/adi,max31827.yaml
+F:     Documentation/hwmon/max31827.rst
+F:     drivers/hwmon/max31827.c
+
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 L:     linux-hwmon@vger.kernel.org
 S:     Orphan
@@ -12788,12 +12882,6 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/phy/mxl-gpy.c
 
-MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
-R:     Yasushi SHOJI <yashi@spacecubics.com>
-L:     linux-can@vger.kernel.org
-S:     Maintained
-F:     drivers/net/can/usb/mcba_usb.c
-
 MCAN MMIO DEVICE DRIVER
 M:     Chandrasekar Ramakrishnan <rcsekar@samsung.com>
 L:     linux-can@vger.kernel.org
@@ -12803,6 +12891,12 @@ F:     drivers/net/can/m_can/m_can.c
 F:     drivers/net/can/m_can/m_can.h
 F:     drivers/net/can/m_can/m_can_platform.c
 
+MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
+R:     Yasushi SHOJI <yashi@spacecubics.com>
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     drivers/net/can/usb/mcba_usb.c
+
 MCP2221A MICROCHIP USB-HID TO I2C BRIDGE DRIVER
 M:     Rishi Gupta <gupt21@gmail.com>
 L:     linux-i2c@vger.kernel.org
@@ -12836,6 +12930,13 @@ F:     Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
 F:     drivers/net/ieee802154/mcr20a.c
 F:     drivers/net/ieee802154/mcr20a.h
 
+MDIO REGMAP DRIVER
+M:     Maxime Chevallier <maxime.chevallier@bootlin.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/mdio/mdio-regmap.c
+F:     include/linux/mdio/mdio-regmap.h
+
 MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
 M:     William Breathitt Gray <william.gray@linaro.org>
 L:     linux-iio@vger.kernel.org
@@ -13135,6 +13236,15 @@ S:     Maintained
 F:     drivers/net/pcs/pcs-mtk-lynxi.c
 F:     include/linux/pcs/pcs-mtk-lynxi.h
 
+MEDIATEK ETHERNET PHY DRIVERS
+M:     Daniel Golle <daniel@makrotopia.org>
+M:     Qingfang Deng <dqfext@gmail.com>
+M:     SkyLake Huang <SkyLake.Huang@mediatek.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/phy/mediatek-ge-soc.c
+F:     drivers/net/phy/mediatek-ge.c
+
 MEDIATEK I2C CONTROLLER DRIVER
 M:     Qii Wang <qii.wang@mediatek.com>
 L:     linux-i2c@vger.kernel.org
@@ -13196,6 +13306,7 @@ R:      Shayne Chen <shayne.chen@mediatek.com>
 R:     Sean Wang <sean.wang@mediatek.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
+T:     git https://github.com/nbd168/wireless
 F:     Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
 F:     drivers/net/wireless/mediatek/mt76/
 
@@ -13211,13 +13322,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/clock/mediatek,mt7621-sysc.yaml
 F:     drivers/clk/ralink/clk-mt7621.c
 
-MEDIATEK MT7621/28/88 I2C DRIVER
-M:     Stefan Roese <sr@denx.de>
-L:     linux-i2c@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
-F:     drivers/i2c/busses/i2c-mt7621.c
-
 MEDIATEK MT7621 PCIE CONTROLLER DRIVER
 M:     Sergio Paracuellos <sergio.paracuellos@gmail.com>
 S:     Maintained
@@ -13230,6 +13334,19 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/phy/mediatek,mt7621-pci-phy.yaml
 F:     drivers/phy/ralink/phy-mt7621-pci.c
 
+MEDIATEK MT7621/28/88 I2C DRIVER
+M:     Stefan Roese <sr@denx.de>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
+F:     drivers/i2c/busses/i2c-mt7621.c
+
+MEDIATEK MTMIPS CLOCK DRIVER
+M:     Sergio Paracuellos <sergio.paracuellos@gmail.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/clock/mediatek,mtmips-sysc.yaml
+F:     drivers/clk/ralink/clk-mtmips.c
+
 MEDIATEK NAND CONTROLLER DRIVER
 L:     linux-mtd@lists.infradead.org
 S:     Orphan
@@ -13256,10 +13373,11 @@ F:    drivers/memory/mtk-smi.c
 F:     include/soc/mediatek/smi.h
 
 MEDIATEK SWITCH DRIVER
-M:     Sean Wang <sean.wang@mediatek.com>
+M:     Arınç ÜNAL <arinc.unal@arinc9.com>
+M:     Daniel Golle <daniel@makrotopia.org>
 M:     Landen Chao <Landen.Chao@mediatek.com>
 M:     DENG Qingfang <dqfext@gmail.com>
-M:     Daniel Golle <daniel@makrotopia.org>
+M:     Sean Wang <sean.wang@mediatek.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/dsa/mt7530-mdio.c
@@ -13489,10 +13607,22 @@ MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA
 M:     Dmitry Osipenko <digetx@gmail.com>
 L:     linux-pm@vger.kernel.org
 L:     linux-tegra@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 F:     drivers/devfreq/tegra30-devfreq.c
 
+MEMORY HOT(UN)PLUG
+M:     David Hildenbrand <david@redhat.com>
+M:     Oscar Salvador <osalvador@suse.de>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     Documentation/admin-guide/mm/memory-hotplug.rst
+F:     Documentation/core-api/memory-hotplug.rst
+F:     drivers/base/memory.c
+F:     include/linux/memory_hotplug.h
+F:     mm/memory_hotplug.c
+F:     tools/testing/selftests/memory-hotplug/
+
 MEMORY MANAGEMENT
 M:     Andrew Morton <akpm@linux-foundation.org>
 L:     linux-mm@kvack.org
@@ -13511,30 +13641,6 @@ F:     mm/
 F:     tools/mm/
 F:     tools/testing/selftests/mm/
 
-VMALLOC
-M:     Andrew Morton <akpm@linux-foundation.org>
-R:     Uladzislau Rezki <urezki@gmail.com>
-R:     Christoph Hellwig <hch@infradead.org>
-R:     Lorenzo Stoakes <lstoakes@gmail.com>
-L:     linux-mm@kvack.org
-S:     Maintained
-W:     http://www.linux-mm.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
-F:     include/linux/vmalloc.h
-F:     mm/vmalloc.c
-
-MEMORY HOT(UN)PLUG
-M:     David Hildenbrand <david@redhat.com>
-M:     Oscar Salvador <osalvador@suse.de>
-L:     linux-mm@kvack.org
-S:     Maintained
-F:     Documentation/admin-guide/mm/memory-hotplug.rst
-F:     Documentation/core-api/memory-hotplug.rst
-F:     drivers/base/memory.c
-F:     include/linux/memory_hotplug.h
-F:     mm/memory_hotplug.c
-F:     tools/testing/selftests/memory-hotplug/
-
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:     Miquel Raynal <miquel.raynal@bootlin.com>
 M:     Richard Weinberger <richard@nod.at>
@@ -13645,6 +13751,12 @@ W:     http://www.monstr.eu/fdt/
 T:     git git://git.monstr.eu/linux-2.6-microblaze.git
 F:     arch/microblaze/
 
+MICROBLAZE TMR INJECT
+M:     Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml
+F:     drivers/misc/xilinx_tmr_inject.c
+
 MICROBLAZE TMR MANAGER
 M:     Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
 S:     Supported
@@ -13652,12 +13764,6 @@ F:     Documentation/ABI/testing/sysfs-driver-xilinx-tmr-manager
 F:     Documentation/devicetree/bindings/misc/xlnx,tmr-manager.yaml
 F:     drivers/misc/xilinx_tmr_manager.c
 
-MICROBLAZE TMR INJECT
-M:     Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
-S:     Supported
-F:     Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml
-F:     drivers/misc/xilinx_tmr_inject.c
-
 MICROCHIP AT91 DMA DRIVERS
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
 M:     Tudor Ambarus <tudor.ambarus@linaro.org>
@@ -13718,6 +13824,7 @@ MICROCHIP EIC DRIVER
 M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
+F:     Documentation/devicetree/bindings/interrupt-controller/microchip,sama7g5-eic.yaml
 F:     drivers/irqchip/irq-mchp-eic.c
 
 MICROCHIP I2C DRIVER
@@ -13733,10 +13840,10 @@ L:    linux-media@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/media/atmel,isc.yaml
 F:     Documentation/devicetree/bindings/media/microchip,xisc.yaml
-F:     drivers/staging/media/deprecated/atmel/atmel-isc*
-F:     drivers/staging/media/deprecated/atmel/atmel-sama*-isc*
 F:     drivers/media/platform/microchip/microchip-isc*
 F:     drivers/media/platform/microchip/microchip-sama*-isc*
+F:     drivers/staging/media/deprecated/atmel/atmel-isc*
+F:     drivers/staging/media/deprecated/atmel/atmel-sama*-isc*
 F:     include/linux/atmel-isc-media.h
 
 MICROCHIP ISI DRIVER
@@ -13758,13 +13865,6 @@ F:     include/linux/dsa/ksz_common.h
 F:     include/linux/platform_data/microchip-ksz.h
 F:     net/dsa/tag_ksz.c
 
-MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
-M:     Arun Ramadoss <arun.ramadoss@microchip.com>
-R:     UNGLinuxDriver@microchip.com
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/net/phy/microchip_t1.c
-
 MICROCHIP LAN743X ETHERNET DRIVER
 M:     Bryan Whitehead <bryan.whitehead@microchip.com>
 M:     UNGLinuxDriver@microchip.com
@@ -13772,6 +13872,13 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/microchip/lan743x_*
 
+MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
+M:     Arun Ramadoss <arun.ramadoss@microchip.com>
+R:     UNGLinuxDriver@microchip.com
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/phy/microchip_t1.c
+
 MICROCHIP LAN966X ETHERNET DRIVER
 M:     Horatiu Vultur <horatiu.vultur@microchip.com>
 M:     UNGLinuxDriver@microchip.com
@@ -13813,14 +13920,6 @@ S:     Supported
 F:     Documentation/devicetree/bindings/mtd/atmel-nand.txt
 F:     drivers/mtd/nand/raw/atmel/*
 
-MICROCHIP PCI1XXXX GP DRIVER
-M:     Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
-L:     linux-gpio@vger.kernel.org
-S:     Supported
-F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
-F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
-F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
-
 MICROCHIP OTPC DRIVER
 M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -13829,6 +13928,14 @@ F:     Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
 F:     drivers/nvmem/microchip-otpc.c
 F:     include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
 
+MICROCHIP PCI1XXXX GP DRIVER
+M:     Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
+L:     linux-gpio@vger.kernel.org
+S:     Supported
+F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
+F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
+F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
+
 MICROCHIP PCI1XXXX I2C DRIVER
 M:     Tharun Kumar P <tharunkumar.pasumarthi@microchip.com>
 M:     Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
@@ -13844,6 +13951,14 @@ L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/8250/8250_pci1xxxx.c
 
+MICROCHIP POLARFIRE FPGA DRIVERS
+M:     Conor Dooley <conor.dooley@microchip.com>
+R:     Vladimir Georgiev <v.georgiev@metrotek.ru>
+L:     linux-fpga@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
+F:     drivers/fpga/microchip-spi.c
+
 MICROCHIP PWM DRIVER
 M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -13865,6 +13980,12 @@ M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 S:     Supported
 F:     drivers/power/reset/at91-sama5d2_shdwc.c
 
+MICROCHIP SOC DRIVERS
+M:     Conor Dooley <conor@kernel.org>
+S:     Supported
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F:     drivers/soc/microchip/
+
 MICROCHIP SPI DRIVER
 M:     Tudor Ambarus <tudor.ambarus@linaro.org>
 S:     Supported
@@ -13878,11 +13999,12 @@ F:    Documentation/devicetree/bindings/misc/atmel-ssc.txt
 F:     drivers/misc/atmel-ssc.c
 F:     include/linux/atmel-ssc.h
 
-MICROCHIP SOC DRIVERS
-M:     Conor Dooley <conor@kernel.org>
-S:     Supported
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
-F:     drivers/soc/microchip/
+Microchip Timer Counter Block (TCB) Capture Driver
+M:     Kamel Bouhara <kamel.bouhara@bootlin.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/counter/microchip-tcb-capture.c
 
 MICROCHIP USB251XB DRIVER
 M:     Richard Leitner <richard.leitner@skidata.com>
@@ -13999,6 +14121,12 @@ L:     platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/surface/surfacepro3_button.c
 
+MICROSOFT SURFACE SYSTEM AGGREGATOR HUB DRIVER
+M:     Maximilian Luz <luzmaximilian@gmail.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/surface/surface_aggregator_hub.c
+
 MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
 M:     Maximilian Luz <luzmaximilian@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -14014,12 +14142,6 @@ F:     include/linux/surface_acpi_notify.h
 F:     include/linux/surface_aggregator/
 F:     include/uapi/linux/surface_aggregator/
 
-MICROSOFT SURFACE SYSTEM AGGREGATOR HUB DRIVER
-M:     Maximilian Luz <luzmaximilian@gmail.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/surface/surface_aggregator_hub.c
-
 MICROTEK X6 SCANNER
 M:     Oliver Neukum <oliver@neukum.org>
 S:     Maintained
@@ -14029,12 +14151,12 @@ MIKROTIK CRS3XX 98DX3236 BOARD SUPPORT
 M:     Luka Kovacic <luka.kovacic@sartura.hr>
 M:     Luka Perkov <luka.perkov@sartura.hr>
 S:     Maintained
-F:     arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
-F:     arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts
-F:     arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
-F:     arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts
-F:     arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
-F:     arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts
+F:     arch/arm/boot/dts/marvell/armada-xp-crs305-1g-4s-bit.dts
+F:     arch/arm/boot/dts/marvell/armada-xp-crs305-1g-4s.dts
+F:     arch/arm/boot/dts/marvell/armada-xp-crs326-24g-2s-bit.dts
+F:     arch/arm/boot/dts/marvell/armada-xp-crs326-24g-2s.dts
+F:     arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s-bit.dts
+F:     arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s.dts
 
 MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
@@ -14137,7 +14259,7 @@ R:      Lubomir Rintel <lkundrak@v3.sk>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Odd Fixes
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
-F:     arch/arm/boot/dts/mmp*
+F:     arch/arm/boot/dts/marvell/mmp*
 F:     arch/arm/mach-mmp/
 F:     include/linux/soc/mmp/
 
@@ -14185,11 +14307,11 @@ L:    linux-modules@vger.kernel.org
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
-F:     include/linux/module.h
 F:     include/linux/kmod.h
+F:     include/linux/module.h
 F:     kernel/module/
-F:     scripts/module*
 F:     lib/test_kmod.c
+F:     scripts/module*
 F:     tools/testing/selftests/kmod/
 
 MONOLITHIC POWER SYSTEM PMIC DRIVER
@@ -14565,6 +14687,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 F:     Documentation/devicetree/bindings/net/
 F:     drivers/connector/
 F:     drivers/net/
+X:     drivers/net/wireless/
 F:     include/dt-bindings/net/
 F:     include/linux/etherdevice.h
 F:     include/linux/fcdevice.h
@@ -14614,6 +14737,7 @@ B:      mailto:netdev@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 F:     Documentation/core-api/netlink.rst
+F:     Documentation/netlink/
 F:     Documentation/networking/
 F:     Documentation/process/maintainer-netdev.rst
 F:     Documentation/userspace-api/netlink/
@@ -14628,6 +14752,7 @@ F:      include/uapi/linux/netdevice.h
 F:     lib/net_utils.c
 F:     lib/random32.c
 F:     net/
+X:     net/bluetooth/
 F:     tools/net/
 F:     tools/testing/selftests/net/
 
@@ -14674,7 +14799,7 @@ NETWORKING [LABELED] (NetLabel, Labeled IPsec, SECMARK)
 M:     Paul Moore <paul@paul-moore.com>
 L:     netdev@vger.kernel.org
 L:     linux-security-module@vger.kernel.org
-S:     Maintained
+S:     Supported
 W:     https://github.com/netlabel
 F:     Documentation/netlabel/
 F:     include/net/calipso.h
@@ -14710,6 +14835,7 @@ NETWORKING [TCP]
 M:     Eric Dumazet <edumazet@google.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
+F:     include/linux/net_mm.h
 F:     include/linux/tcp.h
 F:     include/net/tcp.h
 F:     include/trace/events/tcp.h
@@ -14778,6 +14904,7 @@ L:      linux-nfs@vger.kernel.org
 S:     Maintained
 W:     http://client.linux-nfs.org
 T:     git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
+F:     Documentation/filesystems/nfs/
 F:     fs/lockd/
 F:     fs/nfs/
 F:     fs/nfs_common/
@@ -14787,7 +14914,6 @@ F:      include/linux/sunrpc/
 F:     include/uapi/linux/nfs*
 F:     include/uapi/linux/sunrpc/
 F:     net/sunrpc/
-F:     Documentation/filesystems/nfs/
 
 NILFS2 FILESYSTEM
 M:     Ryusuke Konishi <konishi.ryusuke@gmail.com>
@@ -14927,6 +15053,7 @@ F:      drivers/ntb/hw/intel/
 
 NTFS FILESYSTEM
 M:     Anton Altaparmakov <anton@tuxera.com>
+R:     Namjae Jeon <linkinjeon@kernel.org>
 L:     linux-ntfs-dev@lists.sourceforge.net
 S:     Supported
 W:     http://www.tuxera.com/
@@ -14991,12 +15118,6 @@ F:     drivers/nvme/target/auth.c
 F:     drivers/nvme/target/fabrics-cmd-auth.c
 F:     include/linux/nvme-auth.h
 
-NVM EXPRESS HARDWARE MONITORING SUPPORT
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-nvme@lists.infradead.org
-S:     Supported
-F:     drivers/nvme/host/hwmon.c
-
 NVM EXPRESS FC TRANSPORT DRIVERS
 M:     James Smart <james.smart@broadcom.com>
 L:     linux-nvme@lists.infradead.org
@@ -15007,6 +15128,12 @@ F:     drivers/nvme/target/fcloop.c
 F:     include/linux/nvme-fc-driver.h
 F:     include/linux/nvme-fc.h
 
+NVM EXPRESS HARDWARE MONITORING SUPPORT
+M:     Guenter Roeck <linux@roeck-us.net>
+L:     linux-nvme@lists.infradead.org
+S:     Supported
+F:     drivers/nvme/host/hwmon.c
+
 NVM EXPRESS TARGET DRIVER
 M:     Christoph Hellwig <hch@lst.de>
 M:     Sagi Grimberg <sagi@grimberg.me>
@@ -15027,6 +15154,13 @@ F:     drivers/nvmem/
 F:     include/linux/nvmem-consumer.h
 F:     include/linux/nvmem-provider.h
 
+NXP BLUETOOTH WIRELESS DRIVERS
+M:     Amitkumar Karwar <amitkumar.karwar@nxp.com>
+M:     Neeraj Kale <neeraj.sanjaykale@nxp.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
+F:     drivers/bluetooth/btnxpuart.c
+
 NXP C45 TJA11XX PHY DRIVER
 M:     Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
 L:     netdev@vger.kernel.org
@@ -15052,16 +15186,17 @@ F:    drivers/iio/gyro/fxas21002c_core.c
 F:     drivers/iio/gyro/fxas21002c_i2c.c
 F:     drivers/iio/gyro/fxas21002c_spi.c
 
-NXP i.MX CLOCK DRIVERS
-M:     Abel Vesa <abelvesa@kernel.org>
-R:     Peng Fan <peng.fan@nxp.com>
-L:     linux-clk@vger.kernel.org
+NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
+M:     Haibo Chen <haibo.chen@nxp.com>
+L:     linux-iio@vger.kernel.org
 L:     linux-imx@nxp.com
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
-F:     Documentation/devicetree/bindings/clock/imx*
-F:     drivers/clk/imx/
-F:     include/dt-bindings/clock/imx*
+F:     Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
+F:     Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
+F:     Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml
+F:     drivers/iio/adc/imx7d_adc.c
+F:     drivers/iio/adc/imx93_adc.c
+F:     drivers/iio/adc/vf610_adc.c
 
 NXP i.MX 8M ISI DRIVER
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -15070,6 +15205,15 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
 F:     drivers/media/platform/nxp/imx8-isi/
 
+NXP i.MX 8MP DW100 V4L2 DRIVER
+M:     Xavier Roumegue <xavier.roumegue@oss.nxp.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/nxp,dw100.yaml
+F:     Documentation/userspace-api/media/drivers/dw100.rst
+F:     drivers/media/platform/nxp/dw100/
+F:     include/uapi/linux/dw100.h
+
 NXP i.MX 8MQ DCSS DRIVER
 M:     Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
 R:     Lucas Stach <l.stach@pengutronix.de>
@@ -15087,17 +15231,24 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
 F:     drivers/iio/adc/imx8qxp-adc.c
 
-NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
-M:     Haibo Chen <haibo.chen@nxp.com>
-L:     linux-iio@vger.kernel.org
+NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
+M:     Mirela Rabulea <mirela.rabulea@nxp.com>
+R:     NXP Linux Team <linux-imx@nxp.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
+F:     drivers/media/platform/nxp/imx-jpeg
+
+NXP i.MX CLOCK DRIVERS
+M:     Abel Vesa <abelvesa@kernel.org>
+R:     Peng Fan <peng.fan@nxp.com>
+L:     linux-clk@vger.kernel.org
 L:     linux-imx@nxp.com
 S:     Maintained
-F:     Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
-F:     Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
-F:     Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml
-F:     drivers/iio/adc/imx7d_adc.c
-F:     drivers/iio/adc/imx93_adc.c
-F:     drivers/iio/adc/vf610_adc.c
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
+F:     Documentation/devicetree/bindings/clock/imx*
+F:     drivers/clk/imx/
+F:     include/dt-bindings/clock/imx*
 
 NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
 M:     Jagan Teki <jagan@amarulasolutions.com>
@@ -15143,34 +15294,17 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/sound/tfa9879.txt
 F:     sound/soc/codecs/tfa9879*
 
-NXP/Goodix TFA989X (TFA1) DRIVER
-M:     Stephan Gerhold <stephan@gerhold.net>
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
-F:     sound/soc/codecs/tfa989x.c
-
 NXP-NCI NFC DRIVER
 S:     Orphan
 F:     Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
 F:     drivers/nfc/nxp-nci
 
-NXP i.MX 8MP DW100 V4L2 DRIVER
-M:     Xavier Roumegue <xavier.roumegue@oss.nxp.com>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/media/nxp,dw100.yaml
-F:     Documentation/userspace-api/media/drivers/dw100.rst
-F:     drivers/media/platform/nxp/dw100/
-F:     include/uapi/linux/dw100.h
-
-NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
-M:     Mirela Rabulea <mirela.rabulea@nxp.com>
-R:     NXP Linux Team <linux-imx@nxp.com>
-L:     linux-media@vger.kernel.org
+NXP/Goodix TFA989X (TFA1) DRIVER
+M:     Stephan Gerhold <stephan@gerhold.net>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
-F:     drivers/media/platform/nxp/imx-jpeg
+F:     Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
+F:     sound/soc/codecs/tfa989x.c
 
 NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
 M:     Jonas Malaco <jonas@protocubo.io>
@@ -15258,19 +15392,13 @@ M:    Tony Lindgren <tony@atomide.com>
 L:     linux-omap@vger.kernel.org
 L:     devicetree@vger.kernel.org
 S:     Maintained
-F:     arch/arm/boot/dts/*am3*
-F:     arch/arm/boot/dts/*am4*
-F:     arch/arm/boot/dts/*am5*
-F:     arch/arm/boot/dts/*dra7*
-F:     arch/arm/boot/dts/*omap*
-F:     arch/arm/boot/dts/logicpd-som-lv*
-F:     arch/arm/boot/dts/logicpd-torpedo*
+F:     arch/arm/boot/dts/ti/omap/
 
 OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 L:     linux-omap@vger.kernel.org
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
-F:     Documentation/arm/omap/dss.rst
+F:     Documentation/arch/arm/omap/dss.rst
 F:     drivers/video/fbdev/omap2/
 
 OMAP FRAMEBUFFER SUPPORT
@@ -15372,7 +15500,7 @@ OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
 M:     Mark Jackson <mpfj@newflow.co.uk>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
-F:     arch/arm/boot/dts/am335x-nano.dts
+F:     arch/arm/boot/dts/ti/omap/am335x-nano.dts
 
 OMAP1 SUPPORT
 M:     Aaro Koskinen <aaro.koskinen@iki.fi>
@@ -15399,6 +15527,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 F:     arch/arm/configs/omap2plus_defconfig
 F:     arch/arm/mach-omap2/
 F:     drivers/bus/ti-sysc.c
+F:     drivers/gpio/gpio-tps65219.c
 F:     drivers/i2c/busses/i2c-omap.c
 F:     drivers/irqchip/irq-omap-intc.c
 F:     drivers/mfd/*omap*.c
@@ -15696,8 +15825,8 @@ M:      Rob Herring <robh+dt@kernel.org>
 M:     Frank Rowand <frowand.list@gmail.com>
 L:     devicetree@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/devicetree
 W:     http://www.devicetree.org/
+C:     irc://irc.libera.chat/devicetree
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 F:     Documentation/ABI/testing/sysfs-firmware-ofw
 F:     drivers/of/
@@ -15713,8 +15842,8 @@ M:      Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
 M:     Conor Dooley <conor+dt@kernel.org>
 L:     devicetree@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/devicetree
 Q:     http://patchwork.ozlabs.org/project/devicetree-bindings/list/
+C:     irc://irc.libera.chat/devicetree
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 F:     Documentation/devicetree/
 F:     arch/*/boot/dts/
@@ -15727,13 +15856,6 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/ptp/ptp_ocp.c
 
-INTEL PTP DFL ToD DRIVER
-M:     Tianfei Zhang <tianfei.zhang@intel.com>
-L:     linux-fpga@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/ptp/ptp_dfl_tod.c
-
 OPENCORES I2C BUS DRIVER
 M:     Peter Korsgaard <peter@korsgaard.com>
 M:     Andrew Lunn <andrew@lunn.ch>
@@ -15752,8 +15874,8 @@ L:      linux-openrisc@vger.kernel.org
 S:     Maintained
 W:     http://openrisc.io
 T:     git https://github.com/openrisc/linux.git
-F:     Documentation/devicetree/bindings/openrisc/
 F:     Documentation/arch/openrisc/
+F:     Documentation/devicetree/bindings/openrisc/
 F:     arch/openrisc/
 F:     drivers/irqchip/irq-ompic.c
 F:     drivers/irqchip/irq-or1k-*
@@ -15826,6 +15948,7 @@ F:      include/media/i2c/ov2659.h
 
 OVERLAY FILESYSTEM
 M:     Miklos Szeredi <miklos@szeredi.hu>
+M:     Amir Goldstein <amir73il@gmail.com>
 L:     linux-unionfs@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
@@ -15928,7 +16051,7 @@ F:      include/uapi/linux/ppdev.h
 
 PARAVIRT_OPS INTERFACE
 M:     Juergen Gross <jgross@suse.com>
-M:     Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
+R:     Ajay Kaher <akaher@vmware.com>
 R:     Alexey Makhalov <amakhalov@vmware.com>
 R:     VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
 L:     virtualization@lists.linux-foundation.org
@@ -16069,6 +16192,14 @@ L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/pci/controller/dwc/*layerscape*
 
+PCI DRIVER FOR FU740
+M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Greentime Hu <greentime.hu@sifive.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
+F:     drivers/pci/controller/dwc/pcie-fu740.c
+
 PCI DRIVER FOR GENERIC OF HOSTS
 M:     Will Deacon <will@kernel.org>
 L:     linux-pci@vger.kernel.org
@@ -16089,14 +16220,6 @@ F:     Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
 F:     Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
 F:     drivers/pci/controller/dwc/*imx6*
 
-PCI DRIVER FOR FU740
-M:     Paul Walmsley <paul.walmsley@sifive.com>
-M:     Greentime Hu <greentime.hu@sifive.com>
-L:     linux-pci@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
-F:     drivers/pci/controller/dwc/pcie-fu740.c
-
 PCI DRIVER FOR INTEL IXP4XX
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
@@ -16176,8 +16299,8 @@ M:      Jingoo Han <jingoohan1@gmail.com>
 M:     Gustavo Pimentel <gustavo.pimentel@synopsys.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
 F:     Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
+F:     Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
 F:     drivers/pci/controller/dwc/*designware*
 
 PCI DRIVER FOR TI DRA7XX/J721E
@@ -16197,6 +16320,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
 F:     drivers/pci/controller/pci-v3-semi.c
 
+PCI DRIVER FOR XILINX VERSAL CPM
+M:     Bharat Kumar Gogada <bharat.kumar.gogada@amd.com>
+M:     Michal Simek <michal.simek@amd.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
+F:     drivers/pci/controller/pcie-xilinx-cpm.c
+
 PCI ENDPOINT SUBSYSTEM
 M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
 M:     Krzysztof Wilczyński <kw@linux.com>
@@ -16234,19 +16365,6 @@ L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.rst
 
-PCI PEER-TO-PEER DMA (P2PDMA)
-M:     Bjorn Helgaas <bhelgaas@google.com>
-M:     Logan Gunthorpe <logang@deltatee.com>
-L:     linux-pci@vger.kernel.org
-S:     Supported
-Q:     https://patchwork.kernel.org/project/linux-pci/list/
-B:     https://bugzilla.kernel.org
-C:     irc://irc.oftc.net/linux-pci
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
-F:     Documentation/driver-api/pci/p2pdma.rst
-F:     drivers/pci/p2pdma.c
-F:     include/linux/pci-p2pdma.h
-
 PCI MSI DRIVER FOR ALTERA MSI IP
 M:     Joyce Ooi <joyce.ooi@intel.com>
 L:     linux-pci@vger.kernel.org
@@ -16277,6 +16395,19 @@ F:     drivers/pci/controller/
 F:     drivers/pci/pci-bridge-emul.c
 F:     drivers/pci/pci-bridge-emul.h
 
+PCI PEER-TO-PEER DMA (P2PDMA)
+M:     Bjorn Helgaas <bhelgaas@google.com>
+M:     Logan Gunthorpe <logang@deltatee.com>
+L:     linux-pci@vger.kernel.org
+S:     Supported
+Q:     https://patchwork.kernel.org/project/linux-pci/list/
+B:     https://bugzilla.kernel.org
+C:     irc://irc.oftc.net/linux-pci
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
+F:     Documentation/driver-api/pci/p2pdma.rst
+F:     drivers/pci/p2pdma.c
+F:     include/linux/pci-p2pdma.h
+
 PCI SUBSYSTEM
 M:     Bjorn Helgaas <bhelgaas@google.com>
 L:     linux-pci@vger.kernel.org
@@ -16356,7 +16487,7 @@ F:      Documentation/devicetree/bindings/pci/intel,keembay-pcie*
 F:     drivers/pci/controller/dwc/pcie-keembay.c
 
 PCIE DRIVER FOR INTEL LGM GW SOC
-M:     Rahul Tanwar <rtanwar@maxlinear.com>
+M:     Chuanhua Lei <lchuanhua@maxlinear.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
@@ -16385,14 +16516,6 @@ L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/controller/dwc/pcie-qcom.c
 
-PCIE ENDPOINT DRIVER FOR QUALCOMM
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-L:     linux-pci@vger.kernel.org
-L:     linux-arm-msm@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
-F:     drivers/pci/controller/dwc/pcie-qcom-ep.c
-
 PCIE DRIVER FOR ROCKCHIP
 M:     Shawn Lin <shawn.lin@rock-chips.com>
 L:     linux-pci@vger.kernel.org
@@ -16414,13 +16537,13 @@ L:    linux-pci@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/controller/dwc/*spear*
 
-PCI DRIVER FOR XILINX VERSAL CPM
-M:     Bharat Kumar Gogada <bharat.kumar.gogada@amd.com>
-M:     Michal Simek <michal.simek@amd.com>
+PCIE ENDPOINT DRIVER FOR QUALCOMM
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-pci@vger.kernel.org
+L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
-F:     drivers/pci/controller/pcie-xilinx-cpm.c
+F:     Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
+F:     drivers/pci/controller/dwc/pcie-qcom-ep.c
 
 PCMCIA SUBSYSTEM
 M:     Dominik Brodowski <linux@dominikbrodowski.net>
@@ -16690,9 +16813,9 @@ R:      Alim Akhtar <alim.akhtar@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/linux-exynos
 Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
 B:     mailto:linux-samsung-soc@vger.kernel.org
+C:     irc://irc.libera.chat/linux-exynos
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 F:     Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
 F:     drivers/pinctrl/samsung/
@@ -16754,13 +16877,6 @@ M:     Logan Gunthorpe <logang@deltatee.com>
 S:     Maintained
 F:     drivers/dma/plx_dma.c
 
-PM6764TR DRIVER
-M:     Charles Hsu     <hsu.yungteng@gmail.com>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/pm6764tr.rst
-F:     drivers/hwmon/pmbus/pm6764tr.c
-
 PM-GRAPH UTILITY
 M:     "Todd E Brandt" <todd.e.brandt@linux.intel.com>
 L:     linux-pm@vger.kernel.org
@@ -16770,6 +16886,13 @@ B:     https://bugzilla.kernel.org/buglist.cgi?component=pm-graph&product=Tools
 T:     git git://github.com/intel/pm-graph
 F:     tools/power/pm-graph
 
+PM6764TR DRIVER
+M:     Charles Hsu     <hsu.yungteng@gmail.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/pm6764tr.rst
+F:     drivers/hwmon/pmbus/pm6764tr.c
+
 PMBUS HARDWARE MONITORING DRIVERS
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -16850,15 +16973,6 @@ F:     include/linux/pm_*
 F:     include/linux/powercap.h
 F:     kernel/configs/nopm.config
 
-DYNAMIC THERMAL POWER MANAGEMENT (DTPM)
-M:     Daniel Lezcano <daniel.lezcano@kernel.org>
-L:     linux-pm@vger.kernel.org
-S:     Supported
-B:     https://bugzilla.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
-F:     drivers/powercap/dtpm*
-F:     include/linux/dtpm.h
-
 POWER STATE COORDINATION INTERFACE (PSCI)
 M:     Mark Rutland <mark.rutland@arm.com>
 M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
@@ -17017,8 +17131,8 @@ R:      Guilherme G. Piccoli <gpiccoli@igalia.com>
 L:     linux-hardening@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
-F:     Documentation/admin-guide/ramoops.rst
 F:     Documentation/admin-guide/pstore-blk.rst
+F:     Documentation/admin-guide/ramoops.rst
 F:     Documentation/devicetree/bindings/reserved-memory/ramoops.yaml
 F:     drivers/acpi/apei/erst.c
 F:     drivers/firmware/efi/efi-pstore.c
@@ -17135,7 +17249,7 @@ L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://github.com/hzhuang1/linux.git
 T:     git git://github.com/rjarzmik/linux.git
-F:     arch/arm/boot/dts/pxa*
+F:     arch/arm/boot/dts/intel/pxa/
 F:     arch/arm/mach-pxa/
 F:     drivers/dma/pxa*
 F:     drivers/pcmcia/pxa2xx*
@@ -17167,12 +17281,13 @@ F:    sound/soc/codecs/lpass-va-macro.c
 F:     sound/soc/codecs/lpass-wsa-macro.*
 F:     sound/soc/codecs/msm8916-wcd-analog.c
 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/wcd9335.*
+F:     sound/soc/codecs/wcd934x.c
 F:     sound/soc/codecs/wsa881x.c
 F:     sound/soc/codecs/wsa883x.c
+F:     sound/soc/codecs/wsa884x.c
 F:     sound/soc/qcom/
 
 QCOM EMBEDDED USB DEBUGGER (EUD)
@@ -17327,35 +17442,38 @@ Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/anttip/media_tree.git
 F:     drivers/media/tuners/qt1010*
 
+QUALCOMM ATH12K WIRELESS DRIVER
+M:     Kalle Valo <kvalo@kernel.org>
+L:     ath12k@lists.infradead.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
+F:     drivers/net/wireless/ath/ath12k/
+
 QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
 L:     ath10k@lists.infradead.org
 S:     Supported
 W:     https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
-F:     drivers/net/wireless/ath/ath10k/
 F:     Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
+F:     drivers/net/wireless/ath/ath10k/
 
 QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
 L:     ath11k@lists.infradead.org
 S:     Supported
+W:     https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
+B:     https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 F:     Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
 F:     drivers/net/wireless/ath/ath11k/
 
-QUALCOMM ATH12K WIRELESS DRIVER
-M:     Kalle Valo <kvalo@kernel.org>
-L:     ath12k@lists.infradead.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
-F:     drivers/net/wireless/ath/ath12k/
-
 QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 M:     Toke Høiland-Jørgensen <toke@toke.dk>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 W:     https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 F:     Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
 F:     drivers/net/wireless/ath/ath9k/
 
@@ -17388,6 +17506,8 @@ F:      include/dt-bindings/clock/qcom,*
 
 QUALCOMM CLOUD AI (QAIC) DRIVER
 M:     Jeffrey Hugo <quic_jhugo@quicinc.com>
+R:     Carl Vanderlip <quic_carlv@quicinc.com>
+R:     Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>
 L:     linux-arm-msm@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
@@ -17447,8 +17567,8 @@ F:      include/uapi/misc/fastrpc.h
 QUALCOMM HEXAGON ARCHITECTURE
 M:     Brian Cain <bcain@quicinc.com>
 L:     linux-hexagon@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux.git
 S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux.git
 F:     arch/hexagon/
 
 QUALCOMM HIDMA DRIVER
@@ -17570,9 +17690,9 @@ M:      Christian König <christian.koenig@amd.com>
 M:     Pan, Xinhui <Xinhui.Pan@amd.com>
 L:     amd-gfx@lists.freedesktop.org
 S:     Supported
-T:     git https://gitlab.freedesktop.org/agd5f/linux.git
 B:     https://gitlab.freedesktop.org/drm/amd/-/issues
 C:     irc://irc.oftc.net/radeon
+T:     git https://gitlab.freedesktop.org/agd5f/linux.git
 F:     Documentation/gpu/amdgpu/
 F:     drivers/gpu/drm/amd/
 F:     drivers/gpu/drm/radeon/
@@ -17660,8 +17780,8 @@ F:      arch/mips/generic/board-ranchu.c
 RANDOM NUMBER DRIVER
 M:     "Theodore Ts'o" <tytso@mit.edu>
 M:     Jason A. Donenfeld <Jason@zx2c4.com>
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
 S:     Maintained
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
 F:     drivers/char/random.c
 F:     drivers/virt/vmgenid.c
 
@@ -17695,8 +17815,8 @@ T:      git git://linuxtv.org/media_tree.git
 F:     Documentation/driver-api/media/rc-core.rst
 F:     Documentation/userspace-api/media/rc/
 F:     drivers/media/rc/
-F:     include/media/rc-map.h
 F:     include/media/rc-core.h
+F:     include/media/rc-map.h
 F:     include/uapi/linux/lirc.h
 
 RCMM REMOTE CONTROLS DECODER
@@ -17785,7 +17905,7 @@ M:      Boqun Feng <boqun.feng@gmail.com>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 R:     Lai Jiangshan <jiangshanlai@gmail.com>
-R:     Zqiang <qiang1.zhang@intel.com>
+R:     Zqiang <qiang.zhang1211@gmail.com>
 L:     rcu@vger.kernel.org
 S:     Supported
 W:     http://www.rdrop.com/users/paulmck/RCU/
@@ -17813,6 +17933,14 @@ F:     include/linux/rtc/
 F:     include/uapi/linux/rtc.h
 F:     tools/testing/selftests/rtc/
 
+Real-time Linux Analysis (RTLA) tools
+M:     Daniel Bristot de Oliveira <bristot@kernel.org>
+M:     Steven Rostedt <rostedt@goodmis.org>
+L:     linux-trace-kernel@vger.kernel.org
+S:     Maintained
+F:     Documentation/tools/rtla/
+F:     tools/tracing/rtla/
+
 REALTEK AUDIO CODECS
 M:     Oder Chiou <oder_chiou@realtek.com>
 S:     Maintained
@@ -17936,6 +18064,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/sound/renesas,idt821034.yaml
 F:     sound/soc/codecs/idt821034.c
 
+RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+L:     linux-mtd@lists.infradead.org
+L:     linux-renesas-soc@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
+F:     drivers/mtd/nand/raw/renesas-nand-controller.c
+
 RENESAS R-CAR GYROADC DRIVER
 M:     Marek Vasut <marek.vasut@gmail.com>
 L:     linux-iio@vger.kernel.org
@@ -17954,9 +18090,9 @@ F:      drivers/i2c/busses/i2c-sh_mobile.c
 
 RENESAS R-CAR SATA DRIVER
 R:     Sergey Shtylyov <s.shtylyov@omp.ru>
-S:     Supported
 L:     linux-ide@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
+S:     Supported
 F:     Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
 F:     drivers/ata/sata_rcar.c
 
@@ -17976,12 +18112,6 @@ S:     Supported
 F:     Documentation/devicetree/bindings/i2c/renesas,riic.yaml
 F:     drivers/i2c/busses/i2c-riic.c
 
-RENESAS USB PHY DRIVER
-M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
-L:     linux-renesas-soc@vger.kernel.org
-S:     Maintained
-F:     drivers/phy/renesas/phy-rcar-gen3-usb*.c
-
 RENESAS RZ/G2L A/D DRIVER
 M:     Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
 L:     linux-iio@vger.kernel.org
@@ -18027,13 +18157,19 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml
 F:     drivers/usb/gadget/udc/renesas_usbf.c
 
-RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com>
-L:     linux-mtd@lists.infradead.org
+RENESAS RZ/V2M I2C DRIVER
+M:     Fabrizio Castro <fabrizio.castro.jz@renesas.com>
+L:     linux-i2c@vger.kernel.org
+L:     linux-renesas-soc@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml
+F:     drivers/i2c/busses/i2c-rzv2m.c
+
+RENESAS USB PHY DRIVER
+M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 L:     linux-renesas-soc@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
-F:     drivers/mtd/nand/raw/renesas-nand-controller.c
+F:     drivers/phy/renesas/phy-rcar-gen3-usb*.c
 
 RENESAS VERSACLOCK 7 CLOCK DRIVER
 M:     Alex Helms <alexander.helms.jy@renesas.com>
@@ -18101,15 +18237,6 @@ S:     Maintained
 F:     drivers/mtd/nand/raw/r852.c
 F:     drivers/mtd/nand/raw/r852.h
 
-RISC-V PMU DRIVERS
-M:     Atish Patra <atishp@atishpatra.org>
-R:     Anup Patel <anup@brainfault.org>
-L:     linux-riscv@lists.infradead.org
-S:     Supported
-F:     drivers/perf/riscv_pmu.c
-F:     drivers/perf/riscv_pmu_legacy.c
-F:     drivers/perf/riscv_pmu_sbi.c
-
 RISC-V ARCHITECTURE
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 M:     Palmer Dabbelt <palmer@dabbelt.com>
@@ -18161,6 +18288,25 @@ Q:     https://patchwork.kernel.org/project/linux-riscv/list/
 T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 F:     Documentation/devicetree/bindings/riscv/
 F:     arch/riscv/boot/dts/
+X:     arch/riscv/boot/dts/allwinner/
+X:     arch/riscv/boot/dts/renesas/
+
+RISC-V PMU DRIVERS
+M:     Atish Patra <atishp@atishpatra.org>
+R:     Anup Patel <anup@brainfault.org>
+L:     linux-riscv@lists.infradead.org
+S:     Supported
+F:     drivers/perf/riscv_pmu.c
+F:     drivers/perf/riscv_pmu_legacy.c
+F:     drivers/perf/riscv_pmu_sbi.c
+
+RISC-V THEAD SoC SUPPORT
+M:     Jisheng Zhang <jszhang@kernel.org>
+M:     Guo Ren <guoren@kernel.org>
+M:     Fu Wei <wefu@redhat.com>
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+F:     arch/riscv/boot/dts/thead/
 
 RNBD BLOCK DRIVERS
 M:     Md. Haris Iqbal <haris.iqbal@ionos.com>
@@ -18370,7 +18516,7 @@ F:      drivers/infiniband/ulp/rtrs/
 RUNTIME VERIFICATION (RV)
 M:     Daniel Bristot de Oliveira <bristot@kernel.org>
 M:     Steven Rostedt <rostedt@goodmis.org>
-L:     linux-trace-devel@vger.kernel.org
+L:     linux-trace-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/trace/rv/
 F:     include/linux/rv.h
@@ -18466,14 +18612,6 @@ F:     drivers/s390/net/*iucv*
 F:     include/net/iucv/
 F:     net/iucv/
 
-S390 NETWORK DRIVERS
-M:     Alexandra Winter <wintera@linux.ibm.com>
-M:     Wenjia Zhang <wenjia@linux.ibm.com>
-L:     linux-s390@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     drivers/s390/net/
-
 S390 MM
 M:     Alexander Gordeev <agordeev@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
@@ -18483,14 +18621,22 @@ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
 F:     arch/s390/include/asm/pgtable.h
 F:     arch/s390/mm
 
+S390 NETWORK DRIVERS
+M:     Alexandra Winter <wintera@linux.ibm.com>
+M:     Wenjia Zhang <wenjia@linux.ibm.com>
+L:     linux-s390@vger.kernel.org
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/s390/net/
+
 S390 PCI SUBSYSTEM
 M:     Niklas Schnelle <schnelle@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
+F:     Documentation/s390/pci.rst
 F:     arch/s390/pci/
 F:     drivers/pci/hotplug/s390_pci_hpc.c
-F:     Documentation/s390/pci.rst
 
 S390 SCM DRIVER
 M:     Vineeth Vijayan <vneethv@linux.ibm.com>
@@ -18575,10 +18721,9 @@ F:     Documentation/admin-guide/LSM/SafeSetID.rst
 F:     security/safesetid/
 
 SAMSUNG AUDIO (ASoC) DRIVERS
-M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Supported
+S:     Maintained
 B:     mailto:linux-samsung-soc@vger.kernel.org
 F:     Documentation/devicetree/bindings/sound/samsung*
 F:     sound/soc/samsung/
@@ -18706,7 +18851,6 @@ F:      include/dt-bindings/clock/samsung,*.h
 F:     include/linux/clk/samsung.h
 
 SAMSUNG SPI DRIVERS
-M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 M:     Andi Shyti <andi.shyti@kernel.org>
 L:     linux-spi@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
@@ -18747,7 +18891,7 @@ SANCLOUD BEAGLEBONE ENHANCED DEVICE TREE
 M:     Paul Barker <paul.barker@sancloud.com>
 R:     Marc Murphy <marc.murphy@sancloud.com>
 S:     Supported
-F:     arch/arm/boot/dts/am335x-sancloud*
+F:     arch/arm/boot/dts/ti/omap/am335x-sancloud*
 
 SC1200 WDT DRIVER
 M:     Zwane Mwaikambo <zwanem@gmail.com>
@@ -18842,12 +18986,11 @@ F:    drivers/target/
 F:     include/target/
 
 SCTP PROTOCOL
-M:     Neil Horman <nhorman@tuxdriver.com>
 M:     Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
 M:     Xin Long <lucien.xin@gmail.com>
 L:     linux-sctp@vger.kernel.org
 S:     Maintained
-W:     http://lksctp.sourceforge.net
+W:     https://github.com/sctp/lksctp-tools/wiki
 F:     Documentation/networking/sctp.rst
 F:     include/linux/sctp.h
 F:     include/net/sctp/
@@ -18903,7 +19046,7 @@ K:      \bsecure_computing
 K:     \bTIF_SECCOMP\b
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
-M:     Kamal Dasu <kdasu.kdev@gmail.com>
+M:     Kamal Dasu <kamal.dasu@broadcom.com>
 M:     Al Cooper <alcooperx@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-mmc@vger.kernel.org
@@ -18923,6 +19066,13 @@ L:     linux-mmc@vger.kernel.org
 S:     Supported
 F:     drivers/mmc/host/sdhci-of-at91.c
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
+M:     Haibo Chen <haibo.chen@nxp.com>
+L:     linux-imx@nxp.com
+L:     linux-mmc@vger.kernel.org
+S:     Maintained
+F:     drivers/mmc/host/sdhci-esdhc-imx.c
+
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:     Ben Dooks <ben-linux@fluff.org>
 M:     Jaehoon Chung <jh80.chung@samsung.com>
@@ -18942,13 +19092,6 @@ L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/sdhci-omap.c
 
-SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
-M:     Haibo Chen <haibo.chen@nxp.com>
-L:     linux-imx@nxp.com
-L:     linux-mmc@vger.kernel.org
-S:     Maintained
-F:     drivers/mmc/host/sdhci-esdhc-imx.c
-
 SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
 M:     Jonathan Derrick <jonathan.derrick@linux.dev>
 L:     linux-block@vger.kernel.org
@@ -18958,6 +19101,15 @@ F:     block/sed*
 F:     include/linux/sed*
 F:     include/uapi/linux/sed*
 
+SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
+M:     Mark Rutland <mark.rutland@arm.com>
+M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
+M:     Sudeep Holla <sudeep.holla@arm.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/firmware/smccc/
+F:     include/linux/arm-smccc.h
+
 SECURITY CONTACT
 M:     Security Officers <security@kernel.org>
 S:     Supported
@@ -19107,6 +19259,9 @@ SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 M:     Karsten Graul <kgraul@linux.ibm.com>
 M:     Wenjia Zhang <wenjia@linux.ibm.com>
 M:     Jan Karcher <jaka@linux.ibm.com>
+R:     D. Wythe <alibuda@linux.alibaba.com>
+R:     Tony Lu <tonylu@linux.alibaba.com>
+R:     Wen Gu <guwen@linux.alibaba.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
 F:     net/smc/
@@ -19407,15 +19562,6 @@ M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
 F:     drivers/net/ethernet/smsc/smc91x.*
 
-SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
-M:     Mark Rutland <mark.rutland@arm.com>
-M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
-M:     Sudeep Holla <sudeep.holla@arm.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     drivers/firmware/smccc/
-F:     include/linux/arm-smccc.h
-
 SMM665 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -19463,6 +19609,10 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/smsc/smsc9420.*
 
+SNET DPU VIRTIO DATA PATH ACCELERATOR
+R:     Alvaro Karsz <alvaro.karsz@solid-run.com>
+F:     drivers/vdpa/solidrun/
+
 SOCIONEXT (SNI) AVE NETWORK DRIVER
 M:     Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 L:     netdev@vger.kernel.org
@@ -19570,15 +19720,15 @@ F:    include/uapi/linux/raid/
 SOLIDRUN CLEARFOG SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 S:     Maintained
-F:     arch/arm/boot/dts/armada-388-clearfog*
-F:     arch/arm/boot/dts/armada-38x-solidrun-*
+F:     arch/arm/boot/dts/marvell/armada-388-clearfog*
+F:     arch/arm/boot/dts/marvell/armada-38x-solidrun-*
 
 SOLIDRUN CUBOX-I/HUMMINGBOARD SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 S:     Maintained
-F:     arch/arm/boot/dts/imx6*-cubox-i*
-F:     arch/arm/boot/dts/imx6*-hummingboard*
-F:     arch/arm/boot/dts/imx6*-sr-*
+F:     arch/arm/boot/dts/nxp/imx/imx6*-cubox-i*
+F:     arch/arm/boot/dts/nxp/imx/imx6*-hummingboard*
+F:     arch/arm/boot/dts/nxp/imx/imx6*-sr-*
 
 SONIC NETWORK DRIVER
 M:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
@@ -19732,6 +19882,13 @@ F:     include/uapi/sound/
 F:     sound/
 F:     tools/testing/selftests/alsa
 
+SOUND - ALSA SELFTESTS
+M:     Mark Brown <broonie@kernel.org>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+L:     linux-kselftest@vger.kernel.org
+S:     Supported
+F:     tools/testing/selftests/alsa
+
 SOUND - COMPRESSED AUDIO
 M:     Vinod Koul <vkoul@kernel.org>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -19750,13 +19907,6 @@ F:     include/sound/dmaengine_pcm.h
 F:     sound/core/pcm_dmaengine.c
 F:     sound/soc/soc-generic-dmaengine-pcm.c
 
-SOUND - ALSA SELFTESTS
-M:     Mark Brown <broonie@kernel.org>
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-L:     linux-kselftest@vger.kernel.org
-S:     Supported
-F:     tools/testing/selftests/alsa
-
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
 M:     Liam Girdwood <lgirdwood@gmail.com>
 M:     Mark Brown <broonie@kernel.org>
@@ -19776,8 +19926,8 @@ M:      Liam Girdwood <lgirdwood@gmail.com>
 M:     Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
 M:     Bard Liao <yung-chuan.liao@linux.intel.com>
 M:     Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-R:     Kai Vehmanen <kai.vehmanen@linux.intel.com>
 M:     Daniel Baluta <daniel.baluta@nxp.com>
+R:     Kai Vehmanen <kai.vehmanen@linux.intel.com>
 L:     sound-open-firmware@alsa-project.org (moderated for non-subscribers)
 S:     Supported
 W:     https://github.com/thesofproject/linux/
@@ -19839,9 +19989,9 @@ M:      "Luc Van Oostenryck" <luc.vanoostenryck@gmail.com>
 L:     linux-sparse@vger.kernel.org
 S:     Maintained
 W:     https://sparse.docs.kernel.org/
-T:     git git://git.kernel.org/pub/scm/devel/sparse/sparse.git
 Q:     https://patchwork.kernel.org/project/linux-sparse/list/
 B:     https://bugzilla.kernel.org/enter_bug.cgi?component=Sparse&product=Tools
+T:     git git://git.kernel.org/pub/scm/devel/sparse/sparse.git
 F:     include/linux/compiler.h
 
 SPEAKUP CONSOLE SPEECH DRIVER
@@ -19863,7 +20013,7 @@ M:      soc@kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     http://www.st.com/spear
-F:     arch/arm/boot/dts/spear*
+F:     arch/arm/boot/dts/st/spear*
 F:     arch/arm/mach-spear/
 F:     drivers/clk/spear/
 F:     drivers/pinctrl/spear/
@@ -20127,6 +20277,12 @@ F:     Documentation/devicetree/bindings/power/starfive*
 F:     drivers/soc/starfive/jh71xx_pmu.c
 F:     include/dt-bindings/power/starfive,jh7110-pmu.h
 
+STARFIVE JH7110 TDM DRIVER
+M:     Walker Chen <walker.chen@starfivetech.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml
+F:     sound/soc/starfive/jh7110_tdm.c
+
 STARFIVE SOC DRIVERS
 M:     Conor Dooley <conor@kernel.org>
 S:     Maintained
@@ -20210,6 +20366,11 @@ W:     http://www.stlinux.com
 F:     Documentation/networking/device_drivers/ethernet/stmicro/
 F:     drivers/net/ethernet/stmicro/stmmac/
 
+SUN HAPPY MEAL ETHERNET DRIVER
+M:     Sean Anderson <seanga2@gmail.com>
+S:     Maintained
+F:     drivers/net/ethernet/sun/sunhme.*
+
 SUN3/3X
 M:     Sam Creasey <sammy@sammy.net>
 S:     Maintained
@@ -20232,11 +20393,6 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/dlink/sundance.c
 
-SUN HAPPY MEAL ETHERNET DRIVER
-M:     Sean Anderson <seanga2@gmail.com>
-S:     Maintained
-F:     drivers/net/ethernet/sun/sunhme.*
-
 SUNPLUS ETHERNET DRIVER
 M:     Wells Lu <wellslutw@gmail.com>
 L:     netdev@vger.kernel.org
@@ -20258,15 +20414,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
 F:     drivers/nvmem/sunplus-ocotp.c
 
-SUNPLUS USB2 PHY DRIVER
-M:     Vincent Shih <vincent.sunplus@gmail.com>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
-F:     drivers/phy/sunplus/Kconfig
-F:     drivers/phy/sunplus/Makefile
-F:     drivers/phy/sunplus/phy-sunplus-usb2.c
-
 SUNPLUS PWM DRIVER
 M:     Hammer Hsieh <hammerh0314@gmail.com>
 S:     Maintained
@@ -20293,6 +20440,15 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
 F:     drivers/tty/serial/sunplus-uart.c
 
+SUNPLUS USB2 PHY DRIVER
+M:     Vincent Shih <vincent.sunplus@gmail.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
+F:     drivers/phy/sunplus/Kconfig
+F:     drivers/phy/sunplus/Makefile
+F:     drivers/phy/sunplus/phy-sunplus-usb2.c
+
 SUNPLUS WATCHDOG DRIVER
 M:     Xiantao Hu <xt.hu@cqplus1.com>
 L:     linux-watchdog@vger.kernel.org
@@ -20704,6 +20860,14 @@ F:     include/linux/if_team.h
 F:     include/uapi/linux/if_team.h
 F:     tools/testing/selftests/drivers/net/team/
 
+TECHNICAL ADVISORY BOARD PROCESS DOCS
+M:     "Theodore Ts'o" <tytso@mit.edu>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:     tech-board-discuss@lists.linux-foundation.org
+S:     Maintained
+F:     Documentation/process/contribution-maturity-model.rst
+F:     Documentation/process/researcher-guidelines.rst
+
 TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
 M:     "Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>
 S:     Maintained
@@ -20783,6 +20947,14 @@ M:     Thierry Reding <thierry.reding@gmail.com>
 S:     Supported
 F:     drivers/pwm/pwm-tegra.c
 
+TEGRA QUAD SPI DRIVER
+M:     Thierry Reding <thierry.reding@gmail.com>
+M:     Jonathan Hunter <jonathanh@nvidia.com>
+M:     Sowjanya Komatineni <skomatineni@nvidia.com>
+L:     linux-tegra@vger.kernel.org
+S:     Maintained
+F:     drivers/spi/spi-tegra210-quad.c
+
 TEGRA SERIAL DRIVER
 M:     Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
@@ -20793,14 +20965,6 @@ M:     Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
 F:     drivers/spi/spi-tegra*
 
-TEGRA QUAD SPI DRIVER
-M:     Thierry Reding <thierry.reding@gmail.com>
-M:     Jonathan Hunter <jonathanh@nvidia.com>
-M:     Sowjanya Komatineni <skomatineni@nvidia.com>
-L:     linux-tegra@vger.kernel.org
-S:     Maintained
-F:     drivers/spi/spi-tegra210-quad.c
-
 TEGRA VIDEO DRIVER
 M:     Thierry Reding <thierry.reding@gmail.com>
 M:     Jonathan Hunter <jonathanh@nvidia.com>
@@ -20849,13 +21013,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
 F:     sound/soc/ti/
 
-TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
-M:     Ricardo Ribalda <ribalda@kernel.org>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-F:     Documentation/devicetree/bindings/iio/dac/ti,dac7612.yaml
-F:     drivers/iio/dac/ti-dac7612.c
-
 TEXAS INSTRUMENTS DMA DRIVERS
 M:     Peter Ujfalusi <peter.ujfalusi@gmail.com>
 L:     dmaengine@vger.kernel.org
@@ -20864,10 +21021,26 @@ F:    Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
 F:     Documentation/devicetree/bindings/dma/ti-edma.txt
 F:     Documentation/devicetree/bindings/dma/ti/
 F:     drivers/dma/ti/
-X:     drivers/dma/ti/cppi41.c
+F:     include/linux/dma/k3-psil.h
 F:     include/linux/dma/k3-udma-glue.h
 F:     include/linux/dma/ti-cppi5.h
-F:     include/linux/dma/k3-psil.h
+X:     drivers/dma/ti/cppi41.c
+
+TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
+M:     Robert Marko <robert.marko@sartura.hr>
+M:     Luka Perkov <luka.perkov@sartura.hr>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
+F:     Documentation/hwmon/tps23861.rst
+F:     drivers/hwmon/tps23861.c
+
+TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
+M:     Ricardo Ribalda <ribalda@kernel.org>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/iio/dac/ti,dac7612.yaml
+F:     drivers/iio/dac/ti-dac7612.c
 
 TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
 M:     Nishanth Menon <nm@ti.com>
@@ -20885,22 +21058,13 @@ F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml
 F:     drivers/clk/keystone/sci-clk.c
 F:     drivers/firmware/ti_sci*
 F:     drivers/irqchip/irq-ti-sci-inta.c
-F:     drivers/irqchip/irq-ti-sci-intr.c
-F:     drivers/reset/reset-ti-sci.c
-F:     drivers/soc/ti/ti_sci_inta_msi.c
-F:     drivers/soc/ti/ti_sci_pm_domains.c
-F:     include/dt-bindings/soc/ti,sci_pm_domain.h
-F:     include/linux/soc/ti/ti_sci_inta_msi.h
-F:     include/linux/soc/ti/ti_sci_protocol.h
-
-TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
-M:     Robert Marko <robert.marko@sartura.hr>
-M:     Luka Perkov <luka.perkov@sartura.hr>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
-F:     Documentation/hwmon/tps23861.rst
-F:     drivers/hwmon/tps23861.c
+F:     drivers/irqchip/irq-ti-sci-intr.c
+F:     drivers/reset/reset-ti-sci.c
+F:     drivers/soc/ti/ti_sci_inta_msi.c
+F:     drivers/soc/ti/ti_sci_pm_domains.c
+F:     include/dt-bindings/soc/ti,sci_pm_domain.h
+F:     include/linux/soc/ti/ti_sci_inta_msi.h
+F:     include/linux/soc/ti/ti_sci_protocol.h
 
 TEXAS INSTRUMENTS' TMP117 TEMPERATURE SENSOR DRIVER
 M:     Puranjay Mohan <puranjay12@gmail.com>
@@ -21063,7 +21227,7 @@ L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 F:     Documentation/devicetree/bindings/i2c/i2c-davinci.txt
-F:     arch/arm/boot/dts/da850*
+F:     arch/arm/boot/dts/ti/davinci/
 F:     arch/arm/mach-davinci/
 F:     drivers/i2c/busses/i2c-davinci.c
 
@@ -21378,8 +21542,8 @@ M:      Steven Rostedt <rostedt@goodmis.org>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/*
 F:     fs/tracefs/
@@ -21407,31 +21571,15 @@ TRACING OS NOISE / LATENCY TRACERS
 M:     Steven Rostedt <rostedt@goodmis.org>
 M:     Daniel Bristot de Oliveira <bristot@kernel.org>
 S:     Maintained
-F:     kernel/trace/trace_osnoise.c
+F:     Documentation/trace/hwlat_detector.rst
+F:     Documentation/trace/osnoise-tracer.rst
+F:     Documentation/trace/timerlat-tracer.rst
+F:     arch/*/kernel/trace.c
 F:     include/trace/events/osnoise.h
 F:     kernel/trace/trace_hwlat.c
 F:     kernel/trace/trace_irqsoff.c
+F:     kernel/trace/trace_osnoise.c
 F:     kernel/trace/trace_sched_wakeup.c
-F:     Documentation/trace/osnoise-tracer.rst
-F:     Documentation/trace/timerlat-tracer.rst
-F:     Documentation/trace/hwlat_detector.rst
-F:     arch/*/kernel/trace.c
-
-Real-time Linux Analysis (RTLA) tools
-M:     Daniel Bristot de Oliveira <bristot@kernel.org>
-M:     Steven Rostedt <rostedt@goodmis.org>
-L:     linux-trace-devel@vger.kernel.org
-S:     Maintained
-F:     Documentation/tools/rtla/
-F:     tools/tracing/rtla/
-
-TECHNICAL ADVISORY BOARD PROCESS DOCS
-M:     "Theodore Ts'o" <tytso@mit.edu>
-M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:     tech-board-discuss@lists.linux-foundation.org
-S:     Maintained
-F:     Documentation/process/researcher-guidelines.rst
-F:     Documentation/process/contribution-maturity-model.rst
 
 TRADITIONAL CHINESE DOCUMENTATION
 M:     Hu Haowen <src.res@email.cn>
@@ -21789,8 +21937,8 @@ USB ISP1760 DRIVER
 M:     Rui Miguel Silva <rui.silva@linaro.org>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     drivers/usb/isp1760/*
 F:     Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
+F:     drivers/usb/isp1760/*
 
 USB LAN78XX ETHERNET DRIVER
 M:     Woojung Huh <woojung.huh@microchip.com>
@@ -21861,6 +22009,13 @@ L:     linux-usb@vger.kernel.org
 S:     Supported
 F:     drivers/usb/class/usblp.c
 
+USB QMI WWAN NETWORK DRIVER
+M:     Bjørn Mork <bjorn@mork.no>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-class-net-qmi
+F:     drivers/net/usb/qmi_wwan.c
+
 USB RAW GADGET DRIVER
 R:     Andrey Konovalov <andreyknvl@gmail.com>
 L:     linux-usb@vger.kernel.org
@@ -21869,13 +22024,6 @@ F:     Documentation/usb/raw-gadget.rst
 F:     drivers/usb/gadget/legacy/raw_gadget.c
 F:     include/uapi/linux/usb/raw_gadget.h
 
-USB QMI WWAN NETWORK DRIVER
-M:     Bjørn Mork <bjorn@mork.no>
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     Documentation/ABI/testing/sysfs-class-net-qmi
-F:     drivers/net/usb/qmi_wwan.c
-
 USB RTL8150 DRIVER
 M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org
@@ -22127,6 +22275,12 @@ F:     drivers/vfio/mdev/
 F:     include/linux/mdev.h
 F:     samples/vfio-mdev/
 
+VFIO MLX5 PCI DRIVER
+M:     Yishai Hadas <yishaih@nvidia.com>
+L:     kvm@vger.kernel.org
+S:     Maintained
+F:     drivers/vfio/pci/mlx5/
+
 VFIO PCI DEVICE SPECIFIC DRIVERS
 R:     Jason Gunthorpe <jgg@nvidia.com>
 R:     Yishai Hadas <yishaih@nvidia.com>
@@ -22143,12 +22297,6 @@ L:     kvm@vger.kernel.org
 S:     Maintained
 F:     drivers/vfio/platform/
 
-VFIO MLX5 PCI DRIVER
-M:     Yishai Hadas <yishaih@nvidia.com>
-L:     kvm@vger.kernel.org
-S:     Maintained
-F:     drivers/vfio/pci/mlx5/
-
 VGA_SWITCHEROO
 R:     Lukas Wunner <lukas@wunner.de>
 S:     Maintained
@@ -22158,8 +22306,8 @@ F:      drivers/gpu/vga/vga_switcheroo.c
 F:     include/linux/vga_switcheroo.h
 
 VIA RHINE NETWORK DRIVER
-S:     Maintained
 M:     Kevin Brace <kevinbrace@bracecomputerlab.com>
+S:     Maintained
 F:     drivers/net/ethernet/via/via-rhine.c
 
 VIA SD/MMC CARD CONTROLLER DRIVER
@@ -22174,7 +22322,6 @@ L:      linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/video/fbdev/via/
 F:     include/linux/via-core.h
-F:     include/linux/via-gpio.h
 F:     include/linux/via_i2c.h
 
 VIA VELOCITY NETWORK DRIVER
@@ -22211,6 +22358,14 @@ S:     Maintained
 F:     drivers/media/common/videobuf2/*
 F:     include/media/videobuf2-*
 
+VIDTV VIRTUAL DIGITAL TV DRIVER
+M:     Daniel W. S. Almeida <dwlsalmeida@gmail.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+W:     https://linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/test-drivers/vidtv/*
+
 VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 M:     Shuah Khan <skhan@linuxfoundation.org>
 R:     Kieran Bingham <kieran.bingham@ideasonboard.com>
@@ -22240,6 +22395,16 @@ F:     include/uapi/linux/virtio_vsock.h
 F:     net/vmw_vsock/virtio_transport.c
 F:     net/vmw_vsock/virtio_transport_common.c
 
+VIRTIO BALLOON
+M:     "Michael S. Tsirkin" <mst@redhat.com>
+M:     David Hildenbrand <david@redhat.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/virtio/virtio_balloon.c
+F:     include/linux/balloon_compaction.h
+F:     include/uapi/linux/virtio_balloon.h
+F:     mm/balloon_compaction.c
+
 VIRTIO BLOCK AND SCSI DRIVERS
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 M:     Jason Wang <jasowang@redhat.com>
@@ -22282,30 +22447,6 @@ F:     include/linux/vringh.h
 F:     include/uapi/linux/virtio_*.h
 F:     tools/virtio/
 
-VISL VIRTUAL STATELESS DECODER DRIVER
-M:     Daniel Almeida <daniel.almeida@collabora.com>
-L:     linux-media@vger.kernel.org
-S:     Supported
-F:     drivers/media/test-drivers/visl
-
-IFCVF VIRTIO DATA PATH ACCELERATOR
-R:     Zhu Lingshan <lingshan.zhu@intel.com>
-F:     drivers/vdpa/ifcvf/
-
-SNET DPU VIRTIO DATA PATH ACCELERATOR
-R:     Alvaro Karsz <alvaro.karsz@solid-run.com>
-F:     drivers/vdpa/solidrun/
-
-VIRTIO BALLOON
-M:     "Michael S. Tsirkin" <mst@redhat.com>
-M:     David Hildenbrand <david@redhat.com>
-L:     virtualization@lists.linux-foundation.org
-S:     Maintained
-F:     drivers/virtio/virtio_balloon.c
-F:     include/uapi/linux/virtio_balloon.h
-F:     include/linux/balloon_compaction.h
-F:     mm/balloon_compaction.c
-
 VIRTIO CRYPTO DRIVER
 M:     Gonglei <arei.gonglei@huawei.com>
 L:     virtualization@lists.linux-foundation.org
@@ -22366,11 +22507,20 @@ L:    virtualization@lists.linux-foundation.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
-F:     kernel/vhost_task.c
 F:     drivers/vhost/
 F:     include/linux/sched/vhost_task.h
 F:     include/linux/vhost_iotlb.h
 F:     include/uapi/linux/vhost.h
+F:     kernel/vhost_task.c
+
+VIRTIO I2C DRIVER
+M:     Conghui Chen <conghui.chen@intel.com>
+M:     Viresh Kumar <viresh.kumar@linaro.org>
+L:     linux-i2c@vger.kernel.org
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/i2c/busses/i2c-virtio.c
+F:     include/uapi/linux/virtio_i2c.h
 
 VIRTIO INPUT DRIVER
 M:     Gerd Hoffmann <kraxel@redhat.com>
@@ -22393,6 +22543,13 @@ W:     https://virtio-mem.gitlab.io/
 F:     drivers/virtio/virtio_mem.c
 F:     include/uapi/linux/virtio_mem.h
 
+VIRTIO PMEM DRIVER
+M:     Pankaj Gupta <pankaj.gupta.linux@gmail.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/nvdimm/nd_virtio.c
+F:     drivers/nvdimm/virtio_pmem.c
+
 VIRTIO SOUND DRIVER
 M:     Anton Yakovlev <anton.yakovlev@opensynergy.com>
 M:     "Michael S. Tsirkin" <mst@redhat.com>
@@ -22402,22 +22559,6 @@ S:     Maintained
 F:     include/uapi/linux/virtio_snd.h
 F:     sound/virtio/*
 
-VIRTIO I2C DRIVER
-M:     Conghui Chen <conghui.chen@intel.com>
-M:     Viresh Kumar <viresh.kumar@linaro.org>
-L:     linux-i2c@vger.kernel.org
-L:     virtualization@lists.linux-foundation.org
-S:     Maintained
-F:     drivers/i2c/busses/i2c-virtio.c
-F:     include/uapi/linux/virtio_i2c.h
-
-VIRTIO PMEM DRIVER
-M:     Pankaj Gupta <pankaj.gupta.linux@gmail.com>
-L:     virtualization@lists.linux-foundation.org
-S:     Maintained
-F:     drivers/nvdimm/virtio_pmem.c
-F:     drivers/nvdimm/nd_virtio.c
-
 VIRTUAL BOX GUEST DEVICE DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -22433,12 +22574,26 @@ L:    linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     fs/vboxsf/*
 
+VIRTUAL PCM TEST DRIVER
+M:     Ivan Orlov <ivan.orlov0322@gmail.com>
+L:     alsa-devel@alsa-project.org
+S:     Maintained
+F:     Documentation/sound/cards/pcmtest.rst
+F:     sound/drivers/pcmtest.c
+F:     tools/testing/selftests/alsa/test-pcmtest-driver.c
+
 VIRTUAL SERIO DEVICE DRIVER
 M:     Stephen Chandler Paul <thatslyude@gmail.com>
 S:     Maintained
 F:     drivers/input/serio/userio.c
 F:     include/uapi/linux/userio.h
 
+VISL VIRTUAL STATELESS DECODER DRIVER
+M:     Daniel Almeida <daniel.almeida@collabora.com>
+L:     linux-media@vger.kernel.org
+S:     Supported
+F:     drivers/media/test-drivers/visl
+
 VIVID VIRTUAL VIDEO DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
@@ -22447,14 +22602,6 @@ W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/test-drivers/vivid/*
 
-VIDTV VIRTUAL DIGITAL TV DRIVER
-M:     Daniel W. S. Almeida <dwlsalmeida@gmail.com>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-W:     https://linuxtv.org
-T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/test-drivers/vidtv/*
-
 VLYNQ BUS
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     openwrt-devel@lists.openwrt.org (subscribers-only)
@@ -22462,16 +22609,6 @@ S:     Maintained
 F:     drivers/vlynq/vlynq.c
 F:     include/linux/vlynq.h
 
-VME SUBSYSTEM
-M:     Martyn Welch <martyn@welchs.me.uk>
-M:     Manohar Vanga <manohar.vanga@gmail.com>
-M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:     linux-kernel@vger.kernel.org
-S:     Odd fixes
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
-F:     Documentation/driver-api/vme.rst
-F:     drivers/staging/vme_user/
-
 VM SOCKETS (AF_VSOCK)
 M:     Stefano Garzarella <sgarzare@redhat.com>
 L:     virtualization@lists.linux-foundation.org
@@ -22485,6 +22622,28 @@ F:     include/uapi/linux/vsockmon.h
 F:     net/vmw_vsock/
 F:     tools/testing/vsock/
 
+VMALLOC
+M:     Andrew Morton <akpm@linux-foundation.org>
+R:     Uladzislau Rezki <urezki@gmail.com>
+R:     Christoph Hellwig <hch@infradead.org>
+R:     Lorenzo Stoakes <lstoakes@gmail.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+W:     http://www.linux-mm.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+F:     include/linux/vmalloc.h
+F:     mm/vmalloc.c
+
+VME SUBSYSTEM
+M:     Martyn Welch <martyn@welchs.me.uk>
+M:     Manohar Vanga <manohar.vanga@gmail.com>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:     linux-kernel@vger.kernel.org
+S:     Odd fixes
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
+F:     Documentation/driver-api/vme.rst
+F:     drivers/staging/vme_user/
+
 VMWARE BALLOON DRIVER
 M:     Nadav Amit <namit@vmware.com>
 R:     VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
@@ -22493,7 +22652,7 @@ S:      Supported
 F:     drivers/misc/vmw_balloon.c
 
 VMWARE HYPERVISOR INTERFACE
-M:     Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
+M:     Ajay Kaher <akaher@vmware.com>
 M:     Alexey Makhalov <amakhalov@vmware.com>
 R:     VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
 L:     virtualization@lists.linux-foundation.org
@@ -22520,8 +22679,8 @@ F:      drivers/scsi/vmw_pvscsi.c
 F:     drivers/scsi/vmw_pvscsi.h
 
 VMWARE VIRTUAL PTP CLOCK DRIVER
-M:     Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
 M:     Deep Shah <sdeep@vmware.com>
+R:     Ajay Kaher <akaher@vmware.com>
 R:     Alexey Makhalov <amakhalov@vmware.com>
 R:     VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
 L:     netdev@vger.kernel.org
@@ -22666,9 +22825,9 @@ F:      drivers/input/tablet/wacom_serial4.c
 WANGXUN ETHERNET DRIVER
 M:     Jiawen Wu <jiawenwu@trustnetic.com>
 M:     Mengyuan Lou <mengyuanlou@net-swift.com>
-W:     https://www.net-swift.com
 L:     netdev@vger.kernel.org
 S:     Maintained
+W:     https://www.net-swift.com
 F:     Documentation/networking/device_drivers/ethernet/wangxun/*
 F:     drivers/net/ethernet/wangxun/
 
@@ -22683,8 +22842,8 @@ F:      Documentation/devicetree/bindings/watchdog/
 F:     Documentation/watchdog/
 F:     drivers/watchdog/
 F:     include/linux/watchdog.h
-F:     include/uapi/linux/watchdog.h
 F:     include/trace/events/watchdog.h
+F:     include/uapi/linux/watchdog.h
 
 WHISKEYCOVE PMIC GPIO DRIVER
 M:     Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
@@ -22841,8 +23000,8 @@ R:      "H. Peter Anvin" <hpa@zytor.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
-F:     Documentation/devicetree/bindings/x86/
 F:     Documentation/arch/x86/
+F:     Documentation/devicetree/bindings/x86/
 F:     arch/x86/
 
 X86 ENTRY CODE
@@ -22973,6 +23132,8 @@ M:      John Fastabend <john.fastabend@gmail.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Supported
+F:     drivers/net/ethernet/*/*/*/*/*xdp*
+F:     drivers/net/ethernet/*/*/*xdp*
 F:     include/net/xdp.h
 F:     include/net/xdp_priv.h
 F:     include/trace/events/xdp.h
@@ -22980,10 +23141,8 @@ F:     kernel/bpf/cpumap.c
 F:     kernel/bpf/devmap.c
 F:     net/core/xdp.c
 F:     samples/bpf/xdp*
-F:     tools/testing/selftests/bpf/*xdp*
 F:     tools/testing/selftests/bpf/*/*xdp*
-F:     drivers/net/ethernet/*/*/*/*/*xdp*
-F:     drivers/net/ethernet/*/*/*xdp*
+F:     tools/testing/selftests/bpf/*xdp*
 K:     (?:\b|_)xdp(?:\b|_)
 
 XDP SOCKETS (AF_XDP)
@@ -22995,11 +23154,11 @@ L:    netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
 F:     Documentation/networking/af_xdp.rst
+F:     include/net/netns/xdp.h
 F:     include/net/xdp_sock*
 F:     include/net/xsk_buff_pool.h
 F:     include/uapi/linux/if_xdp.h
 F:     include/uapi/linux/xdp_diag.h
-F:     include/net/netns/xdp.h
 F:     net/xdp/
 F:     tools/testing/selftests/bpf/*xsk*
 
@@ -23101,11 +23260,11 @@ F:    include/xen/arm/swiotlb-xen.h
 F:     include/xen/swiotlb-xen.h
 
 XFS FILESYSTEM
-C:     irc://irc.oftc.net/xfs
 M:     Darrick J. Wong <djwong@kernel.org>
 L:     linux-xfs@vger.kernel.org
 S:     Supported
 W:     http://xfs.org/
+C:     irc://irc.oftc.net/xfs
 T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 F:     Documentation/ABI/testing/sysfs-fs-xfs
 F:     Documentation/admin-guide/xfs.rst
@@ -23123,8 +23282,9 @@ F:      Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml
 F:     drivers/iio/adc/xilinx-ams.c
 
 XILINX AXI ETHERNET DRIVER
-M:     Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
+M:     Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
 S:     Maintained
+F:     Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
 F:     drivers/net/ethernet/xilinx/xilinx_axienet*
 
 XILINX CAN DRIVER
@@ -23135,19 +23295,31 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/net/can/xilinx,can.yaml
 F:     drivers/net/can/xilinx_can.c
 
+XILINX EVENT MANAGEMENT DRIVER
+M:     Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
+S:     Maintained
+F:     drivers/soc/xilinx/xlnx_event_manager.c
+F:     include/linux/firmware/xlnx-event-manager.h
+
 XILINX GPIO DRIVER
-M:     Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
-R:     Srinivas Neeli <srinivas.neeli@xilinx.com>
+M:     Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
+R:     Srinivas Neeli <srinivas.neeli@amd.com>
 R:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
 F:     Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
+F:     Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
 F:     drivers/gpio/gpio-xilinx.c
 F:     drivers/gpio/gpio-zynq.c
 
+XILINX PWM DRIVER
+M:     Sean Anderson <sean.anderson@seco.com>
+S:     Maintained
+F:     drivers/pwm/pwm-xilinx.c
+F:     include/clocksource/timer-xilinx.h
+
 XILINX SD-FEC IP CORES
-M:     Derek Kiernan <derek.kiernan@xilinx.com>
-M:     Dragan Cvetic <dragan.cvetic@xilinx.com>
+M:     Derek Kiernan <derek.kiernan@amd.com>
+M:     Dragan Cvetic <dragan.cvetic@amd.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt
 F:     Documentation/misc-devices/xilinx_sdfec.rst
@@ -23156,12 +23328,6 @@ F:     drivers/misc/Makefile
 F:     drivers/misc/xilinx_sdfec.c
 F:     include/uapi/misc/xilinx_sdfec.h
 
-XILINX PWM DRIVER
-M:     Sean Anderson <sean.anderson@seco.com>
-S:     Maintained
-F:     drivers/pwm/pwm-xilinx.c
-F:     include/clocksource/timer-xilinx.h
-
 XILINX UARTLITE SERIAL DRIVER
 M:     Peter Korsgaard <jacmet@sunsite.dk>
 L:     linux-serial@vger.kernel.org
@@ -23169,7 +23335,6 @@ S:      Maintained
 F:     drivers/tty/serial/uartlite.c
 
 XILINX VIDEO IP CORES
-M:     Hyun Kwon <hyun.kwon@xilinx.com>
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
@@ -23198,7 +23363,6 @@ F:      include/linux/dma/amd_xdma.h
 F:     include/linux/platform_data/amd_xdma.h
 
 XILINX ZYNQMP DPDMA DRIVER
-M:     Hyun Kwon <hyun.kwon@xilinx.com>
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     dmaengine@vger.kernel.org
 S:     Supported
@@ -23214,7 +23378,6 @@ F:      Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yam
 F:     drivers/edac/zynqmp_edac.c
 
 XILINX ZYNQMP PSGTR PHY DRIVER
-M:     Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com>
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
@@ -23223,16 +23386,10 @@ F:    Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
 F:     drivers/phy/xilinx/phy-zynqmp.c
 
 XILINX ZYNQMP SHA3 DRIVER
-M:     Harsha <harsha.harsha@xilinx.com>
+M:     Harsha <harsha.harsha@amd.com>
 S:     Maintained
 F:     drivers/crypto/xilinx/zynqmp-sha.c
 
-XILINX EVENT MANAGEMENT DRIVER
-M:     Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
-S:     Maintained
-F:     drivers/soc/xilinx/xlnx_event_manager.c
-F:     include/linux/firmware/xlnx-event-manager.h
-
 XILLYBUS DRIVER
 M:     Eli Billauer <eli.billauer@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -23280,6 +23437,13 @@ S:     Maintained
 F:     Documentation/input/devices/yealink.rst
 F:     drivers/input/misc/yealink.*
 
+Z3FOLD COMPRESSED PAGE ALLOCATOR
+M:     Vitaly Wool <vitaly.wool@konsulko.com>
+R:     Miaohe Lin <linmiaohe@huawei.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     mm/z3fold.c
+
 Z8530 DRIVER FOR AX.25
 M:     Joerg Reuter <jreuter@yaina.de>
 L:     linux-hams@vger.kernel.org
@@ -23297,13 +23461,6 @@ L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/zbud.c
 
-Z3FOLD COMPRESSED PAGE ALLOCATOR
-M:     Vitaly Wool <vitaly.wool@konsulko.com>
-R:     Miaohe Lin <linmiaohe@huawei.com>
-L:     linux-mm@kvack.org
-S:     Maintained
-F:     mm/z3fold.c
-
 ZD1211RW WIRELESS DRIVER
 M:     Ulrich Kunitz <kune@deine-taler.de>
 L:     linux-wireless@vger.kernel.org
@@ -23390,10 +23547,10 @@ M:    Nick Terrell <terrelln@fb.com>
 S:     Maintained
 B:     https://github.com/facebook/zstd/issues
 T:     git https://github.com/terrelln/linux.git
+F:     crypto/zstd.c
 F:     include/linux/zstd*
-F:     lib/zstd/
 F:     lib/decompress_unzstd.c
-F:     crypto/zstd.c
+F:     lib/zstd/
 N:     zstd
 K:     zstd
 
@@ -23405,13 +23562,6 @@ L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/zswap.c
 
-NXP BLUETOOTH WIRELESS DRIVERS
-M:     Amitkumar Karwar <amitkumar.karwar@nxp.com>
-M:     Neeraj Kale <neeraj.sanjaykale@nxp.com>
-S:     Maintained
-F:     Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
-F:     drivers/bluetooth/btnxpuart.c
-
 THE REST
 M:     Linus Torvalds <torvalds@linux-foundation.org>
 L:     linux-kernel@vger.kernel.org