Merge patch series "RISC-V Hibernation Support"
[linux-2.6-block.git] / MAINTAINERS
index cec07c796296b9bb728fe9566ebb0afb757e43b3..4e93707933000b591cad42b113773e93342d23b6 100644 (file)
@@ -964,6 +964,14 @@ Q: https://patchwork.kernel.org/project/linux-rdma/list/
 F:     drivers/infiniband/hw/efa/
 F:     include/uapi/rdma/efa-abi.h
 
+AMD CDX BUS DRIVER
+M:     Nipun Gupta <nipun.gupta@amd.com>
+M:     Nikhil Agarwal <nikhil.agarwal@amd.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/bus/xlnx,versal-net-cdx.yaml
+F:     drivers/cdx/*
+F:     include/linux/cdx/*
+
 AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
 M:     John Allen <john.allen@amd.com>
@@ -1041,6 +1049,15 @@ F:       drivers/gpu/drm/amd/include/vi_structs.h
 F:     include/uapi/linux/kfd_ioctl.h
 F:     include/uapi/linux/kfd_sysfs.h
 
+AMD PDS CORE DRIVER
+M:     Shannon Nelson <shannon.nelson@amd.com>
+M:     Brett Creeley <brett.creeley@amd.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+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
@@ -1227,12 +1244,6 @@ 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 AD9389B DRIVER
-M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-F:     drivers/media/i2c/ad9389b*
-
 ANALOG DEVICES INC ADA4250 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1428,11 +1439,6 @@ S:       Supported
 F:     drivers/clk/analogbits/*
 F:     include/linux/clk/analogbits*
 
-ANDROID CONFIG FRAGMENTS
-M:     Rob Herring <robh@kernel.org>
-S:     Supported
-F:     kernel/configs/android*
-
 ANDROID DRIVERS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:     Arve Hjønnevåg <arve@android.com>
@@ -2072,6 +2078,7 @@ M:        Alexander Sverdlin <alexander.sverdlin@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml
+F:     Documentation/devicetree/bindings/sound/cirrus,ep9301-*
 F:     arch/arm/boot/compressed/misc-ep93xx.h
 F:     arch/arm/mach-ep93xx/
 F:     drivers/iio/adc/ep93xx_adc.c
@@ -2091,7 +2098,6 @@ F:        arch/arm/boot/dts/cx92755*
 N:     digicolor
 
 ARM/CORESIGHT FRAMEWORK AND DRIVERS
-M:     Mathieu Poirier <mathieu.poirier@linaro.org>
 M:     Suzuki K Poulose <suzuki.poulose@arm.com>
 R:     Mike Leach <mike.leach@linaro.org>
 R:     Leo Yan <leo.yan@linaro.org>
@@ -2275,7 +2281,7 @@ 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
-F:     drivers/crypto/ixp4xx_crypto.c
+F:     drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
 F:     drivers/gpio/gpio-ixp4xx.c
 F:     drivers/irqchip/irq-ixp4xx.c
 
@@ -4438,6 +4444,13 @@ S:       Maintained
 F:     drivers/scsi/BusLogic.*
 F:     drivers/scsi/FlashPoint.*
 
+BXCAN CAN NETWORK DRIVER
+M:     Dario Binacchi <dario.binacchi@amarulasolutions.com>
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml
+F:     drivers/net/can/bxcan.c
+
 C-MEDIA CMI8788 DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -4912,6 +4925,7 @@ L:        patches@opensource.cirrus.com
 S:     Maintained
 F:     Documentation/devicetree/bindings/sound/cirrus,cs*
 F:     include/dt-bindings/sound/cs*
+F:     include/sound/cs*
 F:     sound/pci/hda/cs*
 F:     sound/pci/hda/hda_cs_dsp_ctl.*
 F:     sound/soc/codecs/cs*
@@ -6321,7 +6335,9 @@ F:        drivers/base/
 F:     fs/debugfs/
 F:     fs/sysfs/
 F:     include/linux/debugfs.h
+F:     include/linux/fwnode.h
 F:     include/linux/kobj*
+F:     include/linux/property.h
 F:     lib/kobj*
 
 DRIVERS FOR OMAP ADAPTIVE VOLTAGE SCALING (AVS)
@@ -6521,6 +6537,7 @@ L:        linux-arm-msm@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
 L:     freedreno@lists.freedesktop.org
 S:     Maintained
+B:     https://gitlab.freedesktop.org/drm/msm/-/issues
 T:     git https://gitlab.freedesktop.org/drm/msm.git
 F:     Documentation/devicetree/bindings/display/msm/
 F:     drivers/gpu/drm/msm/
@@ -6540,6 +6557,13 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
 F:     drivers/gpu/drm/panel/panel-novatek-nt35560.c
 
+DRM DRIVER FOR NOVATEK NT36523 PANELS
+M:     Jianhua Lu <lujianhua000@gmail.com>
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
+F:     drivers/gpu/drm/panel/panel-novatek-nt36523.c
+
 DRM DRIVER FOR NOVATEK NT36672A PANELS
 M:     Sumit Semwal <sumit.semwal@linaro.org>
 S:     Maintained
@@ -6620,6 +6644,16 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
 F:     drivers/gpu/drm/panel/panel-samsung-db7430.c
 
+DRM DRIVER FOR SAMSUNG MIPI DSIM BRIDGE
+M:     Inki Dae <inki.dae@samsung.com>
+M:     Jagan Teki <jagan@amarulasolutions.com>
+M:     Marek Szyprowski <m.szyprowski@samsung.com>
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml
+F:     drivers/gpu/drm/bridge/samsung-dsim.c
+F:     include/drm/bridge/samsung-dsim.h
+
 DRM DRIVER FOR SAMSUNG S6D27A1 PANELS
 M:     Markuss Broks <markuss.broks@gmail.com>
 S:     Maintained
@@ -6827,6 +6861,7 @@ S:        Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/bridge/
 F:     drivers/gpu/drm/bridge/
+F:     include/drm/drm_bridge.h
 
 DRM DRIVERS FOR EXYNOS
 M:     Inki Dae <inki.dae@samsung.com>
@@ -6919,6 +6954,7 @@ F:        drivers/phy/mediatek/phy-mtk-mipi*
 
 DRM DRIVERS FOR NVIDIA TEGRA
 M:     Thierry Reding <thierry.reding@gmail.com>
+M:     Mikko Perttunen <mperttunen@nvidia.com>
 L:     dri-devel@lists.freedesktop.org
 L:     linux-tegra@vger.kernel.org
 S:     Supported
@@ -7047,7 +7083,7 @@ F:        Documentation/devicetree/bindings/display/xlnx/
 F:     drivers/gpu/drm/xlnx/
 
 DRM PANEL DRIVERS
-M:     Thierry Reding <thierry.reding@gmail.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 R:     Sam Ravnborg <sam@ravnborg.org>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
@@ -7528,12 +7564,6 @@ T:       git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/em28xx*
 F:     drivers/media/usb/em28xx/
 
-EMBEDDED LINUX
-M:     Olivia Mackall <olivia@selenic.com>
-M:     David Woodhouse <dwmw2@infradead.org>
-L:     linux-embedded@vger.kernel.org
-S:     Maintained
-
 EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
 M:     Adrian Hunter <adrian.hunter@intel.com>
 M:     Ritesh Harjani <riteshh@codeaurora.org>
@@ -7731,6 +7761,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
 F:     Documentation/filesystems/ext4/
 F:     fs/ext4/
 F:     include/trace/events/ext4.h
+F:     include/uapi/linux/ext4.h
 
 Extended Verification Module (EVM)
 M:     Mimi Zohar <zohar@linux.ibm.com>
@@ -7957,10 +7988,11 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
 F:     drivers/target/sbp/
 
 FIREWIRE SUBSYSTEM
-M:     Stefan Richter <stefanr@s5r6.in-berlin.de>
+M:     Takashi Sakamoto <o-takashi@sakamocchi.jp>
+M:     Takashi Sakamoto <takaswie@kernel.org>
 L:     linux1394-devel@lists.sourceforge.net
 S:     Maintained
-W:     http://ieee1394.wiki.kernel.org/
+W:     http://ieee1394.docs.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
 F:     drivers/firewire/
 F:     include/linux/firewire.h
@@ -8103,7 +8135,7 @@ M:        Pankaj Gupta <pankaj.gupta@nxp.com>
 M:     Gaurav Jain <gaurav.jain@nxp.com>
 L:     linux-crypto@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+F:     Documentation/devicetree/bindings/crypto/fsl,sec-v4.0*
 F:     drivers/crypto/caam/
 
 FREESCALE COLDFIRE M5441X MMC DRIVER
@@ -8251,6 +8283,23 @@ S:       Maintained
 F:     drivers/soc/fsl/qe/
 F:     include/soc/fsl/qe/
 
+FREESCALE QUICC ENGINE QMC DRIVER
+M:     Herve Codina <herve.codina@bootlin.com>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml
+F:     drivers/soc/fsl/qe/qmc.c
+F:     include/soc/fsl/qe/qmc.h
+
+FREESCALE QUICC ENGINE TSA DRIVER
+M:     Herve Codina <herve.codina@bootlin.com>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml
+F:     drivers/soc/fsl/qe/tsa.c
+F:     drivers/soc/fsl/qe/tsa.h
+F:     include/dt-bindings/soc/cpm1-fsl,tsa.h
+
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:     Li Yang <leoyang.li@nxp.com>
 L:     netdev@vger.kernel.org
@@ -8302,6 +8351,14 @@ F:       sound/soc/fsl/fsl*
 F:     sound/soc/fsl/imx*
 F:     sound/soc/fsl/mpc8610_hpcd.c
 
+FREESCALE SOC SOUND QMC DRIVER
+M:     Herve Codina <herve.codina@bootlin.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml
+F:     sound/soc/fsl/fsl_qmc_audio.c
+
 FREESCALE USB PERIPHERAL DRIVERS
 M:     Li Yang <leoyang.li@nxp.com>
 L:     linux-usb@vger.kernel.org
@@ -8421,14 +8478,6 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/fujitsu-laptop.c
 
-FUJITSU M-5MO LS CAMERA ISP DRIVER
-M:     Kyungmin Park <kyungmin.park@samsung.com>
-M:     Heungjun Kim <riverful.kim@samsung.com>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-F:     drivers/media/i2c/m5mols/
-F:     include/media/i2c/m5mols.h
-
 FUJITSU TABLET EXTRAS
 M:     Robert Gerlach <khnz@gmx.de>
 L:     platform-driver-x86@vger.kernel.org
@@ -8693,7 +8742,7 @@ F:        drivers/input/touchscreen/goodix*
 
 GOOGLE ETHERNET DRIVERS
 M:     Jeroen de Borst <jeroendb@google.com>
-M:     Catherine Sullivan <csully@google.com>
+M:     Praveen Kaligineedi <pkaligineedi@google.com>
 R:     Shailend Chand <shailend@google.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -8756,7 +8805,6 @@ F:        Documentation/admin-guide/gpio/
 F:     Documentation/devicetree/bindings/gpio/
 F:     Documentation/driver-api/gpio/
 F:     drivers/gpio/
-F:     include/asm-generic/gpio.h
 F:     include/dt-bindings/gpio/
 F:     include/linux/gpio.h
 F:     include/linux/gpio/
@@ -8943,6 +8991,17 @@ Q:       http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/anttip/media_tree.git
 F:     drivers/media/usb/hackrf/
 
+HANDSHAKE UPCALL FOR TRANSPORT LAYER SECURITY
+M:     Chuck Lever <chuck.lever@oracle.com>
+L:     kernel-tls-handshake@lists.linux.dev
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     Documentation/netlink/specs/handshake.yaml
+F:     Documentation/networking/tls-handshake.rst
+F:     include/net/handshake.h
+F:     include/trace/events/handshake.h
+F:     net/handshake/
+
 HANTRO VPU CODEC DRIVER
 M:     Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 M:     Philipp Zabel <p.zabel@pengutronix.de>
@@ -9523,6 +9582,7 @@ S:        Supported
 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:     arch/arm64/hyperv
@@ -9840,6 +9900,11 @@ 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.*
@@ -9942,6 +10007,13 @@ F:      Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
 F:     Documentation/devicetree/bindings/iio/adc/envelope-detector.yaml
 F:     drivers/iio/adc/envelope-detector.c
 
+IIO LIGHT SENSOR GAIN-TIME-SCALE HELPERS
+M:     Matti Vaittinen <mazziesaccount@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/light/gain-time-scale-helper.c
+F:     drivers/iio/light/gain-time-scale-helper.h
+
 IIO MULTIPLEXER
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-iio@vger.kernel.org
@@ -10286,12 +10358,14 @@ M:    Andy Shevchenko <andy@kernel.org>
 L:     linux-gpio@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
+F:     drivers/gpio/gpio-elkhartlake.c
 F:     drivers/gpio/gpio-ich.c
 F:     drivers/gpio/gpio-merrifield.c
 F:     drivers/gpio/gpio-ml-ioh.c
 F:     drivers/gpio/gpio-pch.c
 F:     drivers/gpio/gpio-sch.c
 F:     drivers/gpio/gpio-sodaville.c
+F:     drivers/gpio/gpio-tangier.c
 
 INTEL GVT-g DRIVERS (Intel GPU Virtualization)
 M:     Zhenyu Wang <zhenyuw@linux.intel.com>
@@ -10384,7 +10458,7 @@ INTEL IXP4XX CRYPTO SUPPORT
 M:     Corentin Labbe <clabbe@baylibre.com>
 L:     linux-crypto@vger.kernel.org
 S:     Maintained
-F:     drivers/crypto/ixp4xx_crypto.c
+F:     drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
 
 INTEL ISHTP ECLITE DRIVER
 M:     Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
@@ -10419,11 +10493,11 @@ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
-F:     drivers/crypto/keembay/Kconfig
-F:     drivers/crypto/keembay/Makefile
-F:     drivers/crypto/keembay/keembay-ocs-aes-core.c
-F:     drivers/crypto/keembay/ocs-aes.c
-F:     drivers/crypto/keembay/ocs-aes.h
+F:     drivers/crypto/intel/keembay/Kconfig
+F:     drivers/crypto/intel/keembay/Makefile
+F:     drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
+F:     drivers/crypto/intel/keembay/ocs-aes.c
+F:     drivers/crypto/intel/keembay/ocs-aes.h
 
 INTEL KEEM BAY OCS ECC CRYPTO DRIVER
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
@@ -10431,20 +10505,20 @@ M:    Prabhjot Khurana <prabhjot.khurana@intel.com>
 M:     Mark Gross <mgross@linux.intel.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
-F:     drivers/crypto/keembay/Kconfig
-F:     drivers/crypto/keembay/Makefile
-F:     drivers/crypto/keembay/keembay-ocs-ecc.c
+F:     drivers/crypto/intel/keembay/Kconfig
+F:     drivers/crypto/intel/keembay/Makefile
+F:     drivers/crypto/intel/keembay/keembay-ocs-ecc.c
 
 INTEL KEEM BAY OCS HCU CRYPTO DRIVER
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 M:     Declan Murphy <declan.murphy@intel.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
-F:     drivers/crypto/keembay/Kconfig
-F:     drivers/crypto/keembay/Makefile
-F:     drivers/crypto/keembay/keembay-ocs-hcu-core.c
-F:     drivers/crypto/keembay/ocs-hcu.c
-F:     drivers/crypto/keembay/ocs-hcu.h
+F:     drivers/crypto/intel/keembay/Kconfig
+F:     drivers/crypto/intel/keembay/Makefile
+F:     drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
+F:     drivers/crypto/intel/keembay/ocs-hcu.c
+F:     drivers/crypto/intel/keembay/ocs-hcu.h
 
 INTEL THUNDER BAY EMMC PHY DRIVER
 M:     Nandhini Srikandan <nandhini.srikandan@intel.com>
@@ -10463,6 +10537,7 @@ F:      drivers/watchdog/mei_wdt.c
 F:     include/linux/mei_aux.h
 F:     include/linux/mei_cl_bus.h
 F:     include/uapi/linux/mei.h
+F:     include/uapi/linux/mei_uuid.h
 F:     include/uapi/linux/uuid.h
 F:     samples/mei/*
 
@@ -11526,16 +11601,6 @@ F:     include/linux/kmemleak.h
 F:     mm/kmemleak.c
 F:     samples/kmemleak/kmemleak-test.c
 
-KMOD KERNEL MODULE LOADER - USERMODE HELPER
-M:     Luis Chamberlain <mcgrof@kernel.org>
-L:     linux-kernel@vger.kernel.org
-L:     linux-modules@vger.kernel.org
-S:     Maintained
-F:     include/linux/kmod.h
-F:     kernel/kmod.c
-F:     lib/test_kmod.c
-F:     tools/testing/selftests/kmod/
-
 KMSAN
 M:     Alexander Potapenko <glider@google.com>
 R:     Marco Elver <elver@google.com>
@@ -11897,6 +11962,7 @@ M:      Scott Wood <oss@buserror.net>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Odd fixes
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
+F:     Documentation/devicetree/bindings/cache/freescale-l2cache.txt
 F:     Documentation/devicetree/bindings/powerpc/fsl/
 F:     arch/powerpc/platforms/83xx/
 F:     arch/powerpc/platforms/85xx/
@@ -12120,6 +12186,13 @@ 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
@@ -12279,7 +12352,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
 F:     Documentation/networking/mac80211-injection.rst
 F:     Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
-F:     drivers/net/wireless/mac80211_hwsim.[ch]
+F:     drivers/net/wireless/virtual/mac80211_hwsim.[ch]
 F:     include/net/mac80211.h
 F:     net/mac80211/
 
@@ -13046,6 +13119,14 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/mediatek/
 
+MEDIATEK ETHERNET PCS DRIVER
+M:     Alexander Couzens <lynxis@fe80.eu>
+M:     Daniel Golle <daniel@makrotopia.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/pcs/pcs-mtk-lynxi.c
+F:     include/linux/pcs/pcs-mtk-lynxi.h
+
 MEDIATEK I2C CONTROLLER DRIVER
 M:     Qii Wang <qii.wang@mediatek.com>
 L:     linux-i2c@vger.kernel.org
@@ -13170,8 +13251,11 @@ MEDIATEK SWITCH DRIVER
 M:     Sean Wang <sean.wang@mediatek.com>
 M:     Landen Chao <Landen.Chao@mediatek.com>
 M:     DENG Qingfang <dqfext@gmail.com>
+M:     Daniel Golle <daniel@makrotopia.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
+F:     drivers/net/dsa/mt7530-mdio.c
+F:     drivers/net/dsa/mt7530-mmio.c
 F:     drivers/net/dsa/mt7530.*
 F:     net/dsa/tag_mtk.c
 
@@ -13372,13 +13456,14 @@ F:    arch/powerpc/include/asm/membarrier.h
 F:     include/uapi/linux/membarrier.h
 F:     kernel/sched/membarrier.c
 
-MEMBLOCK
+MEMBLOCK AND MEMORY MANAGEMENT INITIALIZATION
 M:     Mike Rapoport <rppt@kernel.org>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/core-api/boot-time-mm.rst
 F:     include/linux/memblock.h
 F:     mm/memblock.c
+F:     mm/mm_init.c
 F:     tools/testing/memblock/
 
 MEMORY CONTROLLER DRIVERS
@@ -13413,6 +13498,7 @@ F:      include/linux/memory_hotplug.h
 F:     include/linux/mm.h
 F:     include/linux/mmzone.h
 F:     include/linux/pagewalk.h
+F:     include/trace/events/ksm.h
 F:     mm/
 F:     tools/mm/
 F:     tools/testing/selftests/mm/
@@ -13421,6 +13507,7 @@ 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
@@ -13597,9 +13684,13 @@ F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/spi/spi-at91-usart.c
 
 MICROCHIP AUDIO ASOC DRIVERS
-M:     Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
+M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
+F:     Documentation/devicetree/bindings/sound/atmel*
+F:     Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
+F:     Documentation/devicetree/bindings/sound/microchip,sama7g5-*
+F:     Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt
 F:     sound/soc/atmel
 
 MICROCHIP CSI2DC DRIVER
@@ -13772,9 +13863,10 @@ S:     Supported
 F:     drivers/spi/spi-atmel.*
 
 MICROCHIP SSC DRIVER
-M:     Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
+M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
+F:     Documentation/devicetree/bindings/misc/atmel-ssc.txt
 F:     drivers/misc/atmel-ssc.c
 F:     include/linux/atmel-ssc.h
 
@@ -14087,8 +14179,11 @@ 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:     kernel/module/
 F:     scripts/module*
+F:     lib/test_kmod.c
+F:     tools/testing/selftests/kmod/
 
 MONOLITHIC POWER SYSTEM PMIC DRIVER
 M:     Saravanan Sekar <sravanhome@gmail.com>
@@ -14142,6 +14237,13 @@ S:     Odd Fixes
 F:     Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
 F:     drivers/net/ieee802154/mrf24j40.c
 
+MSI EC DRIVER
+M:     Nikita Kravets <teackot@gmail.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+W:     https://github.com/BeardOverflow/msi-ec
+F:     drivers/platform/x86/msi-ec.*
+
 MSI LAPTOP SUPPORT
 M:     "Lee, Chun-Yi" <jlee@suse.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -14186,14 +14288,6 @@ L:     linux-mtd@lists.infradead.org
 S:     Maintained
 F:     drivers/mtd/devices/docg3*
 
-MT9M032 APTINA SENSOR DRIVER
-M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/i2c/mt9m032.c
-F:     include/media/i2c/mt9m032.h
-
 MT9P031 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -14203,14 +14297,6 @@ F:     Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
 F:     drivers/media/i2c/mt9p031.c
 F:     include/media/i2c/mt9p031.h
 
-MT9T001 APTINA CAMERA SENSOR
-M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/i2c/mt9t001.c
-F:     include/media/i2c/mt9t001.h
-
 MT9T112 APTINA CAMERA SENSOR
 M:     Jacopo Mondi <jacopo@jmondi.org>
 L:     linux-media@vger.kernel.org
@@ -14603,6 +14689,8 @@ L:      mptcp@lists.linux.dev
 S:     Maintained
 W:     https://github.com/multipath-tcp/mptcp_net-next/wiki
 B:     https://github.com/multipath-tcp/mptcp_net-next/issues
+T:     git https://github.com/multipath-tcp/mptcp_net-next.git export-net
+T:     git https://github.com/multipath-tcp/mptcp_net-next.git export
 F:     Documentation/networking/mptcp-sysctl.rst
 F:     include/net/mptcp.h
 F:     include/trace/events/mptcp.h
@@ -14665,7 +14753,6 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/nfc/
 F:     drivers/nfc/
-F:     include/linux/platform_data/nfcmrvl.h
 F:     include/net/nfc/
 F:     include/uapi/linux/nfc.h
 F:     net/nfc/
@@ -14963,6 +15050,13 @@ F:     Documentation/devicetree/bindings/clock/imx*
 F:     drivers/clk/imx/
 F:     include/dt-bindings/clock/imx*
 
+NXP i.MX 8M ISI DRIVER
+M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
+F:     drivers/media/platform/nxp/imx8-isi/
+
 NXP i.MX 8MQ DCSS DRIVER
 M:     Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
 R:     Lucas Stach <l.stach@pengutronix.de>
@@ -15091,8 +15185,8 @@ OBJTOOL
 M:     Josh Poimboeuf <jpoimboe@kernel.org>
 M:     Peter Zijlstra <peterz@infradead.org>
 S:     Supported
+F:     include/linux/objtool*.h
 F:     tools/objtool/
-F:     include/linux/objtool.h
 
 OCELOT ETHERNET SWITCH DRIVER
 M:     Vladimir Oltean <vladimir.oltean@nxp.com>
@@ -15323,18 +15417,6 @@ S:     Maintained
 F:     Documentation/filesystems/omfs.rst
 F:     fs/omfs/
 
-OMNIKEY CARDMAN 4000 DRIVER
-M:     Harald Welte <laforge@gnumonks.org>
-S:     Maintained
-F:     drivers/char/pcmcia/cm4000_cs.c
-F:     include/linux/cm4000_cs.h
-F:     include/uapi/linux/cm4000_cs.h
-
-OMNIKEY CARDMAN 4040 DRIVER
-M:     Harald Welte <laforge@gnumonks.org>
-S:     Maintained
-F:     drivers/char/pcmcia/cm4040_cs.*
-
 OMNIVISION OG01A1B SENSOR DRIVER
 M:     Shawn Tu <shawnx.tu@intel.com>
 L:     linux-media@vger.kernel.org
@@ -15390,6 +15472,7 @@ M:      Shunqian Zheng <zhengsq@rock-chips.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
 F:     drivers/media/i2c/ov2685.c
 
 OMNIVISION OV2740 SENSOR DRIVER
@@ -15481,7 +15564,7 @@ F:      Documentation/devicetree/bindings/media/i2c/ov7740.txt
 F:     drivers/media/i2c/ov7740.c
 
 OMNIVISION OV8856 SENSOR DRIVER
-M:     Dongchun Zhu <dongchun.zhu@mediatek.com>
+M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
@@ -15551,6 +15634,12 @@ L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/oxp-sensors.c
 
+ONIE TLV NVMEM LAYOUT DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/nvmem/layouts/onie,tlv-layout.yaml
+F:     drivers/nvmem/layouts/onie-tlv.c
+
 ONION OMEGA2+ BOARD
 M:     Harvey Hunt <harveyhuntnexus@gmail.com>
 L:     linux-mips@vger.kernel.org
@@ -15624,6 +15713,13 @@ 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>
@@ -15974,6 +16070,8 @@ M:      Lucas Stach <l.stach@pengutronix.de>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
+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*
 
@@ -16332,12 +16430,6 @@ S:     Maintained
 F:     crypto/pcrypt.c
 F:     include/crypto/pcrypt.h
 
-PEAQ WMI HOTKEYS DRIVER
-M:     Hans de Goede <hdegoede@redhat.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/peaq-wmi.c
-
 PECI HARDWARE MONITORING DRIVERS
 M:     Iwona Winiarska <iwona.winiarska@intel.com>
 L:     linux-hwmon@vger.kernel.org
@@ -16774,9 +16866,8 @@ F:      include/uapi/linux/if_pppol2tp.h
 F:     net/l2tp/l2tp_ppp.c
 
 PPP PROTOCOL DRIVERS AND COMPRESSORS
-M:     Paul Mackerras <paulus@samba.org>
 L:     linux-ppp@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/net/ppp/ppp_*
 
 PPS SUPPORT
@@ -17020,7 +17111,7 @@ QAT DRIVER
 M:     Giovanni Cabiddu <giovanni.cabiddu@intel.com>
 L:     qat-linux@intel.com
 S:     Supported
-F:     drivers/crypto/qat/
+F:     drivers/crypto/intel/qat/
 
 QCOM AUDIO (ASoC) DRIVERS
 M:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
@@ -17204,7 +17295,7 @@ 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.txt
+F:     Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
 
 QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
@@ -17240,6 +17331,7 @@ F:      drivers/net/wwan/qcom_bam_dmux.c
 QUALCOMM CAMERA SUBSYSTEM DRIVER
 M:     Robert Foss <rfoss@kernel.org>
 M:     Todor Tomov <todor.too@gmail.com>
+M:     Bryan O'Donoghue <bryan.odonoghue@linaro.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/admin-guide/media/qcom_camss.rst
@@ -17255,6 +17347,16 @@ F:     Documentation/devicetree/bindings/clock/qcom,*
 F:     drivers/clk/qcom/
 F:     include/dt-bindings/clock/qcom,*
 
+QUALCOMM CLOUD AI (QAIC) DRIVER
+M:     Jeffrey Hugo <quic_jhugo@quicinc.com>
+L:     linux-arm-msm@vger.kernel.org
+L:     dri-devel@lists.freedesktop.org
+S:     Supported
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/accel/qaic/
+F:     drivers/accel/qaic/
+F:     include/uapi/drm/qaic_accel.h
+
 QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
 M:     Bjorn Andersson <andersson@kernel.org>
 M:     Konrad Dybcio <konrad.dybcio@linaro.org>
@@ -17277,6 +17379,7 @@ M:      Thara Gopinath <thara.gopinath@gmail.com>
 L:     linux-crypto@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/crypto/qcom-qce.yaml
 F:     drivers/crypto/qce/
 
 QUALCOMM EMAC GIGABIT ETHERNET DRIVER
@@ -17290,7 +17393,7 @@ M:      Vinod Koul <vkoul@kernel.org>
 R:     Bhupesh Sharma <bhupesh.sharma@linaro.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/net/qcom,ethqos.txt
+F:     Documentation/devicetree/bindings/net/qcom,ethqos.yaml
 F:     drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
 
 QUALCOMM FASTRPC DRIVER
@@ -17471,9 +17574,8 @@ F:      drivers/block/rbd.c
 F:     drivers/block/rbd_types.h
 
 RAGE128 FRAMEBUFFER DISPLAY DRIVER
-M:     Paul Mackerras <paulus@samba.org>
 L:     linux-fbdev@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/video/fbdev/aty/aty128fb.c
 
 RAINSHADOW-CEC DRIVER
@@ -17550,7 +17652,7 @@ F:      include/ras/ras_event.h
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
 L:     linux-wireless@vger.kernel.org
 S:     Orphan
-F:     drivers/net/wireless/ray*
+F:     drivers/net/wireless/legacy/ray*
 
 RC-CORE / LIRC FRAMEWORK
 M:     Sean Young <sean@mess.org>
@@ -18101,6 +18203,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/iio/light/bh1750.yaml
 F:     drivers/iio/light/bh1750.c
 
+ROHM BU27034 AMBIENT LIGHT SENSOR DRIVER
+M:     Matti Vaittinen <mazziesaccount@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+F:     drivers/iio/light/rohm-bu27034.c
+
 ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
 M:     Marek Vasut <marek.vasut+renesas@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -18506,6 +18614,7 @@ M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
 M:     Andrzej Hajda <andrzej.hajda@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
+F:     Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml
 F:     drivers/media/i2c/s5c73m3/*
 
 SAMSUNG S5K5BAF CAMERA DRIVER
@@ -18530,6 +18639,11 @@ M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
 Q:     https://patchwork.linuxtv.org/project/linux-media/list/
+F:     Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml
+F:     Documentation/devicetree/bindings/media/samsung,exynos4210-fimc.yaml
+F:     Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml
+F:     Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-lite.yaml
+F:     Documentation/devicetree/bindings/media/samsung,fimc.yaml
 F:     drivers/media/platform/samsung/exynos4-is/
 
 SAMSUNG SOC CLOCK DRIVERS
@@ -18552,7 +18666,7 @@ F:      include/linux/clk/samsung.h
 
 SAMSUNG SPI DRIVERS
 M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-M:     Andi Shyti <andi@etezian.org>
+M:     Andi Shyti <andi.shyti@kernel.org>
 L:     linux-spi@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
@@ -18619,11 +18733,6 @@ F:     include/linux/wait.h
 F:     include/uapi/linux/sched.h
 F:     kernel/sched/
 
-SCR24X CHIP CARD INTERFACE DRIVER
-M:     Lubomir Rintel <lkundrak@v3.sk>
-S:     Supported
-F:     drivers/char/pcmcia/scr24x_cs.c
-
 SCSI RDMA PROTOCOL (SRP) INITIATOR
 M:     Bart Van Assche <bvanassche@acm.org>
 L:     linux-rdma@vger.kernel.org
@@ -18920,6 +19029,14 @@ S:     Supported
 F:     Documentation/networking/devlink/sfc.rst
 F:     drivers/net/ethernet/sfc/
 
+SFCTEMP HWMON DRIVER
+M:     Emil Renner Berthing <kernel@esmil.dk>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
+F:     Documentation/hwmon/sfctemp.rst
+F:     drivers/hwmon/sfctemp.c
+
 SFF/SFP/SFP+ MODULE SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 L:     netdev@vger.kernel.org
@@ -19008,6 +19125,7 @@ L:      linux-media@vger.kernel.org
 S:     Odd Fixes
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/silabs,si470x.yaml
 F:     drivers/media/radio/si470x/radio-si470x-i2c.c
 
 SI470X FM RADIO RECEIVER USB DRIVER
@@ -19083,6 +19201,7 @@ M:      Conor Dooley <conor@kernel.org>
 L:     linux-riscv@lists.infradead.org
 S:     Maintained
 T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F:     Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
 F:     drivers/soc/sifive/
 
 SILEAD TOUCHSCREEN DRIVER
@@ -19192,6 +19311,12 @@ F:     drivers/irqchip/irq-sl28cpld.c
 F:     drivers/pwm/pwm-sl28cpld.c
 F:     drivers/watchdog/sl28cpld_wdt.c
 
+SL28 VPD NVMEM LAYOUT DRIVER
+M:     Michael Walle <michael@walle.cc>
+S:     Maintained
+F:     Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml
+F:     drivers/nvmem/layouts/sl28vpd.c
+
 SLAB ALLOCATOR
 M:     Christoph Lameter <cl@linux.com>
 M:     Pekka Enberg <penberg@kernel.org>
@@ -19914,6 +20039,13 @@ M:     Emil Renner Berthing <kernel@esmil.dk>
 S:     Maintained
 F:     arch/riscv/boot/dts/starfive/
 
+STARFIVE DWMAC GLUE LAYER
+M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Samin Guo <samin.guo@starfivetech.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <kernel@esmil.dk>
 S:     Maintained
@@ -20783,7 +20915,7 @@ L:      linux-pm@vger.kernel.org
 S:     Maintained
 F:     Documentation/driver-api/thermal/power_allocator.rst
 F:     drivers/thermal/gov_power_allocator.c
-F:     include/trace/events/thermal_power_allocator.h
+F:     drivers/thermal/thermal_trace_ipa.h
 
 THINKPAD ACPI EXTRAS DRIVER
 M:     Henrique de Moraes Holschuh <hmh@hmh.eng.br>
@@ -21080,7 +21212,6 @@ F:      Documentation/hwmon/tmp401.rst
 F:     drivers/hwmon/tmp401.c
 
 TMP464 HARDWARE MONITOR DRIVER
-M:     Agathe Porte <agathe.porte@nokia.com>
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
 S:     Maintained
@@ -21385,10 +21516,8 @@ F:     include/uapi/linux/ublk_cmd.h
 UCLINUX (M68KNOMMU AND COLDFIRE)
 M:     Greg Ungerer <gerg@linux-m68k.org>
 L:     linux-m68k@lists.linux-m68k.org
-L:     uclinux-dev@uclinux.org  (subscribers-only)
 S:     Maintained
 W:     http://www.linux-m68k.org/
-W:     http://www.uclinux.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
 F:     arch/m68k/*/*_no.*
 F:     arch/m68k/68*/
@@ -21805,7 +21934,7 @@ USB WIRELESS RNDIS DRIVER (rndis_wlan)
 M:     Jussi Kivilinna <jussi.kivilinna@iki.fi>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
-F:     drivers/net/wireless/rndis_wlan.c
+F:     drivers/net/wireless/legacy/rndis_wlan.c
 
 USB XHCI DRIVER
 M:     Mathias Nyman <mathias.nyman@intel.com>
@@ -22084,6 +22213,7 @@ F:      include/uapi/linux/virtio_console.h
 VIRTIO CORE AND NET DRIVERS
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 M:     Jason Wang <jasowang@redhat.com>
+R:     Xuan Zhuo <xuanzhuo@linux.alibaba.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-vdpa
@@ -22097,6 +22227,7 @@ F:      drivers/vdpa/
 F:     drivers/virtio/
 F:     include/linux/vdpa.h
 F:     include/linux/virtio*.h
+F:     include/linux/vringh.h
 F:     include/uapi/linux/virtio_*.h
 F:     tools/virtio/
 
@@ -22442,7 +22573,7 @@ S:      Orphan
 F:     drivers/mmc/host/vub300.c
 
 W1 DALLAS'S 1-WIRE BUS
-M:     Evgeniy Polyakov <zbr@ioremap.net>
+M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 S:     Maintained
 F:     Documentation/devicetree/bindings/w1/
 F:     Documentation/w1/
@@ -22561,7 +22692,7 @@ F:      drivers/input/misc/wistron_btns.c
 WL3501 WIRELESS PCMCIA CARD DRIVER
 L:     linux-wireless@vger.kernel.org
 S:     Odd fixes
-F:     drivers/net/wireless/wl3501*
+F:     drivers/net/wireless/legacy/wl3501*
 
 WOLFSON MICROELECTRONICS DRIVERS
 L:     patches@opensource.cirrus.com
@@ -22709,7 +22840,7 @@ M:      Hans de Goede <hdegoede@redhat.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
-F:     drivers/platform/x86/x86-android-tablets.c
+F:     drivers/platform/x86/x86-android-tablets/
 
 X86 PLATFORM DRIVERS
 M:     Hans de Goede <hdegoede@redhat.com>
@@ -23058,7 +23189,6 @@ F:      drivers/i2c/busses/i2c-xlp9xx.c
 
 XRA1403 GPIO EXPANDER
 M:     Nandor Han <nandor.han@ge.com>
-M:     Semi Malinen <semi.malinen@ge.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
@@ -23216,6 +23346,13 @@ 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