Merge tag 'modules-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof...
[linux-2.6-microblaze.git] / MAINTAINERS
index 731dbf5..a53a1a2 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
@@ -1422,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>
@@ -2066,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
@@ -2085,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>
@@ -4432,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)
@@ -4906,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*
@@ -6315,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)
@@ -7972,10 +7994,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
@@ -8118,7 +8141,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
@@ -8266,6 +8289,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
@@ -8317,6 +8357,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
@@ -8700,7 +8748,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
@@ -8949,6 +8997,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>
@@ -9948,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
@@ -10471,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/*
 
@@ -11534,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>
@@ -11905,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/
@@ -12294,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/
 
@@ -13061,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
@@ -13185,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
 
@@ -13612,9 +13681,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
@@ -13787,9 +13860,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
 
@@ -14102,8 +14176,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>
@@ -14609,6 +14686,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
@@ -14671,7 +14750,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/
@@ -15336,18 +15414,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
@@ -15565,6 +15631,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
@@ -15638,6 +15710,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>
@@ -15988,6 +16067,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*
 
@@ -16782,9 +16863,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
@@ -17212,7 +17292,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>
@@ -17310,7 +17390,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
@@ -17491,9 +17571,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
@@ -17570,7 +17649,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>
@@ -18121,6 +18200,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
@@ -18578,7 +18663,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
@@ -18645,11 +18730,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
@@ -19118,6 +19198,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
@@ -19227,6 +19308,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>
@@ -19949,6 +20036,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
@@ -21839,7 +21933,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>
@@ -22476,7 +22570,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/
@@ -22595,7 +22689,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
@@ -23249,6 +23343,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