Merge tag 'pci-v6.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
[sfrench/cifs-2.6.git] / MAINTAINERS
index 395fcaad63e7e77aa6ffbd52eeb760e39efea1b2..4bce9cfedfbada937e55257f3198cd15742c86f6 100644 (file)
@@ -24,7 +24,7 @@ Descriptions of section entries and preferred order
           filing info, a direct bug tracker link, or a mailto: URI.
        C: URI for *chat* protocol, server and channel where developers
           usually hang out, for example irc://server/channel.
-       P: Subsystem Profile document for more details submitting
+       P: *Subsystem Profile* document for more details submitting
           patches to the given subsystem. This is either an in-tree file,
           or a URI. See Documentation/maintainer/maintainer-entry-profile.rst
           for details.
@@ -614,7 +614,7 @@ AGPGART DRIVER
 M:     David Airlie <airlied@redhat.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm
+T:     git https://gitlab.freedesktop.org/drm/kernel.git
 F:     drivers/char/agp/
 F:     include/linux/agp*
 F:     include/uapi/linux/agp*
@@ -897,6 +897,12 @@ Q: https://patchwork.kernel.org/project/linux-rdma/list/
 F:     drivers/infiniband/hw/efa/
 F:     include/uapi/rdma/efa-abi.h
 
+AMD ADDRESS TRANSLATION LIBRARY (ATL)
+M:     Yazen Ghannam <Yazen.Ghannam@amd.com>
+L:     linux-edac@vger.kernel.org
+S:     Supported
+F:     drivers/ras/amd/atl/*
+
 AMD AXI W1 DRIVER
 M:     Kris Chaplin <kris.chaplin@amd.com>
 R:     Thomas Delev <thomas.delev@amd.com>
@@ -1098,6 +1104,14 @@ F:       Documentation/devicetree/bindings/perf/amlogic,g12-ddr-pmu.yaml
 F:     drivers/perf/amlogic/
 F:     include/soc/amlogic/
 
+AMPHENOL CHIPCAP 2 HUMIDITY-TEMPERATURE IIO DRIVER
+M:     Javier Carrasco <javier.carrasco.cruz@gmail.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/amphenol,chipcap2.yaml
+F:     Documentation/hwmon/chipcap2.rst
+F:     drivers/hwmon/chipcap2.c
+
 AMPHION VPU CODEC V4L2 DRIVER
 M:     Ming Qian <ming.qian@nxp.com>
 M:     Zhou Peng <eagle.zhou@nxp.com>
@@ -1384,17 +1398,9 @@ F:       drivers/iio/amplifiers/hmc425a.c
 F:     drivers/staging/iio/*/ad*
 X:     drivers/iio/*/adjd*
 
-ANALOG DEVICES INC MAX31760 DRIVER
-M:     Ibrahim Tilki <Ibrahim.Tilki@analog.com>
-S:     Maintained
-W:     http://wiki.analog.com/
-W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/hwmon/adi,max31760.yaml
-F:     Documentation/hwmon/max31760.rst
-F:     drivers/hwmon/max31760.c
-
 ANALOGBITS PLL LIBRARIES
 M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Samuel Holland <samuel.holland@sifive.com>
 S:     Supported
 F:     drivers/clk/analogbits/*
 F:     include/linux/clk/analogbits*
@@ -2156,7 +2162,7 @@ M:        Shawn Guo <shawnguo@kernel.org>
 M:     Sascha Hauer <s.hauer@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 R:     Fabio Estevam <festevam@gmail.com>
-R:     NXP Linux Team <linux-imx@nxp.com>
+L:     imx@lists.linux.dev
 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
@@ -2465,6 +2471,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 F:     Documentation/devicetree/bindings/arm/ste-*
 F:     Documentation/devicetree/bindings/arm/ux500.yaml
 F:     Documentation/devicetree/bindings/arm/ux500/
+F:     Documentation/devicetree/bindings/gpio/st,nomadik-gpio.yaml
 F:     Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml
 F:     arch/arm/boot/dts/st/ste-*
 F:     arch/arm/mach-nomadik/
@@ -2473,6 +2480,7 @@ F:        drivers/clk/clk-nomadik.c
 F:     drivers/clocksource/clksrc-dbx500-prcmu.c
 F:     drivers/dma/ste_dma40*
 F:     drivers/pmdomain/st/ste-ux500-pm-domain.c
+F:     drivers/gpio/gpio-nomadik.c
 F:     drivers/hwspinlock/u8500_hsem.c
 F:     drivers/i2c/busses/i2c-nomadik.c
 F:     drivers/iio/adc/ab8500-gpadc.c
@@ -2542,13 +2550,14 @@ F:      drivers/*/*/*wpcm*
 F:     drivers/*/*wpcm*
 
 ARM/NXP S32G ARCHITECTURE
-M:     Chester Lin <chester62515@gmail.com>
-R:     Andreas Färber <afaerber@suse.de>
+R:     Chester Lin <chester62515@gmail.com>
 R:     Matthias Brugger <mbrugger@suse.com>
-R:     NXP S32 Linux Team <s32@nxp.com>
+R:     Ghennadi Procopciuc <ghennadi.procopciuc@oss.nxp.com>
+L:     NXP S32 Linux Team <s32@nxp.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm64/boot/dts/freescale/s32g*.dts*
+F:     drivers/pinctrl/nxp/
 
 ARM/Orion SoC/Technologic Systems TS-78xx platform support
 M:     Alexander Clouter <alex@digriz.org.uk>
@@ -3168,10 +3177,10 @@ F:      drivers/hwmon/asus-ec-sensors.c
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>
-L:     acpi4asus-user@lists.sourceforge.net
+M:     Luke D. Jones <luke@ljones.dev>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-W:     http://acpi4asus.sf.net
+W:     https://asus-linux.org/
 F:     drivers/platform/x86/asus*.c
 F:     drivers/platform/x86/eeepc*.c
 
@@ -3182,6 +3191,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 ROG RYUJIN AIO HARDWARE MONITOR DRIVER
+M:     Aleksa Savic <savicaleksa83@gmail.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     drivers/hwmon/asus_rog_ryujin.c
+
 ASUS WIRELESS RADIO CONTROL DRIVER
 M:     João Paulo Rechi Vita <jprvita@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -3376,11 +3391,15 @@ F:      drivers/base/auxiliary.c
 F:     include/linux/auxiliary_bus.h
 
 AUXILIARY DISPLAY DRIVERS
-M:     Miguel Ojeda <ojeda@kernel.org>
-S:     Maintained
+M:     Andy Shevchenko <andy@kernel.org>
+R:     Geert Uytterhoeven <geert@linux-m68k.org>
+S:     Odd Fixes
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git
 F:     Documentation/devicetree/bindings/auxdisplay/
 F:     drivers/auxdisplay/
 F:     include/linux/cfag12864b.h
+F:     include/uapi/linux/map_to_14segment.h
+F:     include/uapi/linux/map_to_7segment.h
 
 AVIA HX711 ANALOG DIGITAL CONVERTER IIO DRIVER
 M:     Andreas Klinger <ak@it-klinger.de>
@@ -3799,6 +3818,7 @@ 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:     Eduard Zingerman <eddyz87@gmail.com>
 R:     Song Liu <song@kernel.org>
 R:     Yonghong Song <yonghong.song@linux.dev>
 R:     John Fastabend <john.fastabend@gmail.com>
@@ -3859,6 +3879,7 @@ F:        net/unix/unix_bpf.c
 
 BPF [LIBRARY] (libbpf)
 M:     Andrii Nakryiko <andrii@kernel.org>
+M:     Eduard Zingerman <eddyz87@gmail.com>
 L:     bpf@vger.kernel.org
 S:     Maintained
 F:     tools/lib/bpf/
@@ -3916,6 +3937,7 @@ F:        security/bpf/
 
 BPF [SELFTESTS] (Test Runners & Infrastructure)
 M:     Andrii Nakryiko <andrii@kernel.org>
+M:     Eduard Zingerman <eddyz87@gmail.com>
 R:     Mykola Lysenko <mykolal@fb.com>
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -4169,14 +4191,14 @@ F:      drivers/firmware/broadcom/tee_bnxt_fw.c
 F:     drivers/net/ethernet/broadcom/bnxt/
 F:     include/linux/firmware/broadcom/tee_bnxt_fw.h
 
-BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
-M:     Arend van Spriel <aspriel@gmail.com>
-M:     Franky Lin <franky.lin@broadcom.com>
-M:     Hante Meuleman <hante.meuleman@broadcom.com>
+BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS
+M:     Arend van Spriel <arend.vanspriel@broadcom.com>
 L:     linux-wireless@vger.kernel.org
+L:     brcm80211@lists.linux.dev
 L:     brcm80211-dev-list.pdl@broadcom.com
 S:     Supported
 F:     drivers/net/wireless/broadcom/brcm80211/
+F:     include/linux/platform_data/brcmfmac.h
 
 BROADCOM BRCMSTB GPIO DRIVER
 M:     Doug Berger <opendmb@gmail.com>
@@ -4547,7 +4569,7 @@ F:        drivers/net/ieee802154/ca8210.c
 
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:     David Howells <dhowells@redhat.com>
-L:     linux-cachefs@redhat.com (moderated for non-subscribers)
+L:     netfs@lists.linux.dev
 S:     Supported
 F:     Documentation/filesystems/caching/cachefiles.rst
 F:     fs/cachefiles/
@@ -4629,8 +4651,8 @@ S:        Maintained
 F:     net/sched/sch_cake.c
 
 CAN NETWORK DRIVERS
-M:     Wolfgang Grandegger <wg@grandegger.com>
 M:     Marc Kleine-Budde <mkl@pengutronix.de>
+M:     Vincent Mailhol <mailhol.vincent@wanadoo.fr>
 L:     linux-can@vger.kernel.org
 S:     Maintained
 W:     https://github.com/linux-can
@@ -4990,6 +5012,12 @@ R:       Sami Kyöstilä <skyostil@chromium.org>
 S:     Maintained
 F:     drivers/platform/chrome/cros_hps_i2c.c
 
+CHROMEOS EC WATCHDOG
+M:     Lukasz Majczak <lma@chromium.org>
+L:     chrome-platform@lists.linux.dev
+S:     Maintained
+F:     drivers/watchdog/cros_ec_wdt.c
+
 CHRONTEL CH7322 CEC DRIVER
 M:     Joe Tessler <jrt@google.com>
 L:     linux-media@vger.kernel.org
@@ -5239,6 +5267,7 @@ R:        Paulo Alcantara <pc@manguebit.com> (DFS, global name space)
 R:     Ronnie Sahlberg <ronniesahlberg@gmail.com> (directory leases, sparse files)
 R:     Shyam Prasad N <sprasad@microsoft.com> (multichannel)
 R:     Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
+R:     Bharath SM <bharathsm@microsoft.com> (deferred close, directory leases)
 L:     linux-cifs@vger.kernel.org
 L:     samba-technical@lists.samba.org (moderated for non-subscribers)
 S:     Supported
@@ -5378,7 +5407,7 @@ CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
 M:     Johannes Weiner <hannes@cmpxchg.org>
 M:     Michal Hocko <mhocko@kernel.org>
 M:     Roman Gushchin <roman.gushchin@linux.dev>
-M:     Shakeel Butt <shakeelb@google.com>
+M:     Shakeel Butt <shakeel.butt@linux.dev>
 R:     Muchun Song <muchun.song@linux.dev>
 L:     cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
@@ -5610,6 +5639,11 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
 F:     drivers/net/can/ctucanfd/
 
+CVE ASSIGNMENT CONTACT
+M:     CVE Assignment Team <cve@kernel.org>
+S:     Maintained
+F:     Documentation/process/cve.rst
+
 CW1200 WLAN driver
 S:     Orphan
 F:     drivers/net/wireless/st/cw1200/
@@ -5958,7 +5992,6 @@ 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
@@ -6119,6 +6152,14 @@ F:       include/linux/device-mapper.h
 F:     include/linux/dm-*.h
 F:     include/uapi/linux/dm-*.h
 
+DEVICE-MAPPER VDO TARGET
+M:     Matthew Sakai <msakai@redhat.com>
+M:     dm-devel@lists.linux.dev
+L:     dm-devel@lists.linux.dev
+S:     Maintained
+F:     Documentation/admin-guide/device-mapper/vdo*.rst
+F:     drivers/md/dm-vdo/
+
 DEVLINK
 M:     Jiri Pirko <jiri@resnulli.us>
 L:     netdev@vger.kernel.org
@@ -6146,16 +6187,16 @@ DIALOG SEMICONDUCTOR DRIVERS
 M:     Support Opensource <support.opensource@diasemi.com>
 S:     Supported
 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/input/dlg,da9062-onkey.yaml
 F:     Documentation/devicetree/bindings/mfd/da90*.txt
 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/dlg,slg51000.yaml
 F:     Documentation/devicetree/bindings/sound/da[79]*.txt
-F:     Documentation/devicetree/bindings/thermal/da90??-thermal.txt
-F:     Documentation/devicetree/bindings/watchdog/dlg,da90??-watchdog.yaml
+F:     Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml
+F:     Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml
 F:     Documentation/hwmon/da90??.rst
 F:     drivers/gpio/gpio-da90??.c
 F:     drivers/hwmon/da90??-hwmon.c
@@ -6373,6 +6414,7 @@ L:        linux-doc@vger.kernel.org
 S:     Maintained
 F:     Documentation/admin-guide/quickly-build-trimmed-linux.rst
 F:     Documentation/admin-guide/reporting-issues.rst
+F:     Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst
 
 DOCUMENTATION SCRIPTS
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -6992,7 +7034,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Maintained
 B:     https://gitlab.freedesktop.org/drm
 C:     irc://irc.oftc.net/dri-devel
-T:     git git://anongit.freedesktop.org/drm/drm
+T:     git https://gitlab.freedesktop.org/drm/kernel.git
 F:     Documentation/devicetree/bindings/display/
 F:     Documentation/devicetree/bindings/gpu/
 F:     Documentation/gpu/
@@ -7026,7 +7068,7 @@ X:        drivers/gpu/drm/mediatek/
 X:     drivers/gpu/drm/msm/
 X:     drivers/gpu/drm/nouveau/
 X:     drivers/gpu/drm/radeon/
-X:     drivers/gpu/drm/renesas/
+X:     drivers/gpu/drm/renesas/rcar-du/
 X:     drivers/gpu/drm/tegra/
 
 DRM DRIVERS FOR ALLWINNER A10
@@ -7194,12 +7236,22 @@ F:      Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
 F:     Documentation/devicetree/bindings/display/renesas,du.yaml
 F:     drivers/gpu/drm/renesas/rcar-du/
 
+DRM DRIVERS FOR RENESAS RZ
+M:     Biju Das <biju.das.jz@bp.renesas.com>
+L:     dri-devel@lists.freedesktop.org
+L:     linux-renesas-soc@vger.kernel.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
+F:     drivers/gpu/drm/renesas/rz-du/
+
 DRM DRIVERS FOR RENESAS SHMOBILE
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 L:     dri-devel@lists.freedesktop.org
 L:     linux-renesas-soc@vger.kernel.org
 S:     Supported
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
 F:     drivers/gpu/drm/renesas/shmobile/
 F:     include/linux/platform_data/shmob_drm.h
@@ -7309,6 +7361,7 @@ F:        drivers/gpu/drm/xlnx/
 
 DRM GPU SCHEDULER
 M:     Luben Tuikov <ltuikov89@gmail.com>
+M:     Matthew Brost <matthew.brost@intel.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -7578,7 +7631,6 @@ R:        Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
-F:     Documentation/admin-guide/ras.rst
 F:     Documentation/driver-api/edac.rst
 F:     drivers/edac/
 F:     include/linux/edac.h
@@ -7786,8 +7838,8 @@ F:        drivers/media/usb/em28xx/
 
 EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
 M:     Adrian Hunter <adrian.hunter@intel.com>
-M:     Ritesh Harjani <riteshh@codeaurora.org>
-M:     Asutosh Das <asutoshd@codeaurora.org>
+M:     Asutosh Das <quic_asutoshd@quicinc.com>
+R:     Ritesh Harjani <ritesh.list@gmail.com>
 L:     linux-mmc@vger.kernel.org
 S:     Supported
 F:     drivers/mmc/host/cqhci*
@@ -7885,6 +7937,13 @@ S:       Maintained
 F:     include/linux/errseq.h
 F:     lib/errseq.c
 
+ESD CAN NETWORK DRIVERS
+M:     Stefan Mätje <stefan.maetje@esd.eu>
+R:     socketcan@esd.eu
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     drivers/net/can/esd/
+
 ESD CAN/USB DRIVERS
 M:     Frank Jungclaus <frank.jungclaus@esd.eu>
 R:     socketcan@esd.eu
@@ -7955,12 +8014,13 @@ L:      rust-for-linux@vger.kernel.org
 S:     Maintained
 F:     rust/kernel/net/phy.rs
 
-EXEC & BINFMT API
+EXEC & BINFMT API, ELF
 R:     Eric Biederman <ebiederm@xmission.com>
 R:     Kees Cook <keescook@chromium.org>
 L:     linux-mm@kvack.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
+F:     Documentation/userspace-api/ELF.rst
 F:     fs/*binfmt_*.c
 F:     fs/exec.c
 F:     include/linux/binfmts.h
@@ -7979,11 +8039,19 @@ S:      Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git
 F:     fs/exfat/
 
+EXPRESSWIRE PROTOCOL LIBRARY
+M:     Duje Mihanović <duje.mihanovic@skole.hr>
+L:     linux-leds@vger.kernel.org
+S:     Maintained
+F:     drivers/leds/leds-expresswire.c
+F:     include/linux/leds-expresswire.h
+
 EXT2 FILE SYSTEM
 M:     Jan Kara <jack@suse.com>
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
 F:     Documentation/filesystems/ext2.rst
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git
 F:     fs/ext2/
 F:     include/linux/ext2*
 
@@ -8160,6 +8228,7 @@ F:        include/uapi/scsi/fc/
 FILE LOCKING (flock() and fcntl()/lockf())
 M:     Jeff Layton <jlayton@kernel.org>
 M:     Chuck Lever <chuck.lever@oracle.com>
+R:     Alexander Aring <alex.aring@gmail.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     fs/fcntl.c
@@ -8223,7 +8292,8 @@ F:        include/linux/iomap.h
 
 FILESYSTEMS [NETFS LIBRARY]
 M:     David Howells <dhowells@redhat.com>
-L:     linux-cachefs@redhat.com (moderated for non-subscribers)
+R:     Jeff Layton <jlayton@kernel.org>
+L:     netfs@lists.linux.dev
 L:     linux-fsdevel@vger.kernel.org
 S:     Supported
 F:     Documentation/filesystems/caching/
@@ -8489,7 +8559,7 @@ FREESCALE IMX / MXC FEC DRIVER
 M:     Wei Fang <wei.fang@nxp.com>
 R:     Shenwei Wang <shenwei.wang@nxp.com>
 R:     Clark Wang <xiaoning.wang@nxp.com>
-R:     NXP Linux Team <linux-imx@nxp.com>
+L:     imx@lists.linux.dev
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -8524,7 +8594,7 @@ F:        drivers/i2c/busses/i2c-imx.c
 FREESCALE IMX LPI2C DRIVER
 M:     Dong Aisheng <aisheng.dong@nxp.com>
 L:     linux-i2c@vger.kernel.org
-L:     linux-imx@nxp.com
+L:     imx@lists.linux.dev
 S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
 F:     drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -8584,6 +8654,13 @@ 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 QMC HDLC DRIVER
+M:     Herve Codina <herve.codina@bootlin.com>
+L:     netdev@vger.kernel.org
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Maintained
+F:     drivers/net/wan/fsl_qmc_hdlc.c
+
 FREESCALE QUICC ENGINE TSA DRIVER
 M:     Herve Codina <herve.codina@bootlin.com>
 L:     linuxppc-dev@lists.ozlabs.org
@@ -8975,9 +9052,10 @@ F:       include/linux/string.h
 F:     include/linux/string_choices.h
 F:     include/linux/string_helpers.h
 F:     lib/string.c
+F:     lib/string_kunit.c
 F:     lib/string_helpers.c
-F:     lib/test-string_helpers.c
-F:     lib/test_string.c
+F:     lib/string_helpers_kunit.c
+F:     scripts/coccinelle/api/string_choices.cocci
 
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:     "Michael S. Tsirkin" <mst@redhat.com>
@@ -9079,6 +9157,7 @@ F:        Documentation/devicetree/bindings/clock/google,gs101-clock.yaml
 F:     arch/arm64/boot/dts/exynos/google/
 F:     drivers/clk/samsung/clk-gs101.c
 F:     include/dt-bindings/clock/google,gs101.h
+K:     [gG]oogle.?[tT]ensor
 
 GPD POCKET FAN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
@@ -9148,6 +9227,7 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 F:     Documentation/ABI/obsolete/sysfs-gpio
 F:     Documentation/ABI/testing/gpio-cdev
+F:     Documentation/userspace-api/gpio/
 F:     drivers/gpio/gpiolib-cdev.c
 F:     include/uapi/linux/gpio.h
 F:     tools/gpio/
@@ -10090,7 +10170,7 @@ L:      linux-i2c@vger.kernel.org
 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
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git
 F:     Documentation/devicetree/bindings/i2c/
 F:     drivers/i2c/algos/
 F:     drivers/i2c/busses/
@@ -10282,7 +10362,7 @@ F:      drivers/scsi/ibmvscsi/ibmvscsi*
 F:     include/scsi/viosrp.h
 
 IBM Power Virtual SCSI Device Target Driver
-M:     Michael Cyr <mikecyr@linux.ibm.com>
+M:     Tyrel Datwyler <tyreld@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 L:     target-devel@vger.kernel.org
 S:     Supported
@@ -10466,11 +10546,11 @@ F:    drivers/media/rc/img-ir/
 
 IMGTEC POWERVR DRM DRIVER
 M:     Frank Binns <frank.binns@imgtec.com>
-M:     Donald Robson <donald.robson@imgtec.com>
 M:     Matt Coster <matt.coster@imgtec.com>
 S:     Supported
 T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     Documentation/devicetree/bindings/gpu/img,powervr.yaml
+F:     Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
+F:     Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
 F:     Documentation/gpu/imagination/
 F:     drivers/gpu/drm/imagination/
 F:     include/uapi/drm/pvr_drm.h
@@ -10487,22 +10567,6 @@ L:     linux-fbdev@vger.kernel.org
 S:     Orphan
 F:     drivers/video/fbdev/imsttfb.c
 
-INA209 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/ti,ina2xx.yaml
-F:     Documentation/hwmon/ina209.rst
-F:     drivers/hwmon/ina209.c
-
-INA2XX HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/ina2xx.rst
-F:     drivers/hwmon/ina2xx.c
-F:     include/linux/platform_data/ina2xx.h
-
 INDEX OF FURTHER KERNEL DOCUMENTATION
 M:     Carlos Bilbao <carlos.bilbao@amd.com>
 S:     Maintained
@@ -10728,7 +10792,7 @@ INTEL DRM I915 DRIVER (Meteor Lake, DG2 and older excluding Poulsbo, Moorestown
 M:     Jani Nikula <jani.nikula@linux.intel.com>
 M:     Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
 M:     Rodrigo Vivi <rodrigo.vivi@intel.com>
-M:     Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
+M:     Tvrtko Ursulin <tursulin@ursulin.net>
 L:     intel-gfx@lists.freedesktop.org
 S:     Supported
 W:     https://drm.pages.freedesktop.org/intel-docs/
@@ -10800,11 +10864,11 @@ F:    drivers/gpio/gpio-tangier.h
 
 INTEL GVT-g DRIVERS (Intel GPU Virtualization)
 M:     Zhenyu Wang <zhenyuw@linux.intel.com>
-M:     Zhi Wang <zhi.a.wang@intel.com>
+M:     Zhi Wang <zhi.wang.linux@gmail.com>
 L:     intel-gvt-dev@lists.freedesktop.org
 L:     intel-gfx@lists.freedesktop.org
 S:     Supported
-W:     https://01.org/igvt-g
+W:     https://github.com/intel/gvt-linux/wiki
 T:     git https://github.com/intel/gvt-linux.git
 F:     drivers/gpu/drm/i915/gvt/
 
@@ -11126,7 +11190,6 @@ S:      Supported
 F:     drivers/net/wireless/intel/iwlegacy/
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
-M:     Gregory Greenman <gregory.greenman@intel.com>
 M:     Miri Korenblit <miriam.rachel.korenblit@intel.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
@@ -11151,6 +11214,16 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wwan/iosm/
 
+INTEL(R) FLEXIBLE RETURN AND EVENT DELIVERY
+M:     Xin Li <xin@zytor.com>
+M:     "H. Peter Anvin" <hpa@zytor.com>
+S:     Supported
+F:     Documentation/arch/x86/x86_64/fred.rst
+F:     arch/x86/entry/entry_64_fred.S
+F:     arch/x86/entry/entry_fred.c
+F:     arch/x86/include/asm/fred.h
+F:     arch/x86/kernel/fred.c
+
 INTEL(R) TRACE HUB
 M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
 S:     Supported
@@ -11239,7 +11312,6 @@ F:      drivers/iommu/
 F:     include/linux/iommu.h
 F:     include/linux/iova.h
 F:     include/linux/of_iommu.h
-F:     include/uapi/linux/iommu.h
 
 IOMMUFD
 M:     Jason Gunthorpe <jgg@nvidia.com>
@@ -11479,14 +11551,6 @@ S:     Maintained
 F:     arch/x86/include/asm/jailhouse_para.h
 F:     arch/x86/kernel/jailhouse.c
 
-JC42.4 TEMPERATURE SENSOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml
-F:     Documentation/hwmon/jc42.rst
-F:     drivers/hwmon/jc42.c
-
 JFS FILESYSTEM
 M:     Dave Kleikamp <shaggy@kernel.org>
 L:     jfs-discussion@lists.sourceforge.net
@@ -11724,6 +11788,7 @@ F:      fs/smb/server/
 KERNEL UNIT TESTING FRAMEWORK (KUnit)
 M:     Brendan Higgins <brendanhiggins@google.com>
 M:     David Gow <davidgow@google.com>
+R:     Rae Moar <rmoar@google.com>
 L:     linux-kselftest@vger.kernel.org
 L:     kunit-dev@googlegroups.com
 S:     Maintained
@@ -12045,6 +12110,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml
 F:     drivers/video/backlight/ktd253-backlight.c
 
+KTD2801 BACKLIGHT DRIVER
+M:     Duje Mihanović <duje.mihanovic@skole.hr>
+S:     Maintained
+F:     Documentation/devicetree/bindings/leds/backlight/kinetic,ktd2801.yaml
+F:     drivers/video/backlight/ktd2801-backlight.c
+
 KTEST
 M:     Steven Rostedt <rostedt@goodmis.org>
 M:     John Hawley <warthog9@eaglescrag.net>
@@ -12152,11 +12223,11 @@ F:    Documentation/scsi/53c700.rst
 F:     drivers/scsi/53c700*
 
 LEAKING_ADDRESSES
-M:     Tobin C. Harding <me@tobin.cc>
 M:     Tycho Andersen <tycho@tycho.pizza>
+R:     Kees Cook <keescook@chromium.org>
 L:     linux-hardening@vger.kernel.org
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
 F:     scripts/leaking_addresses.pl
 
 LED SUBSYSTEM
@@ -12510,7 +12581,6 @@ F:      arch/powerpc/include/asm/livepatch.h
 F:     include/linux/livepatch.h
 F:     kernel/livepatch/
 F:     kernel/module/livepatch.c
-F:     lib/livepatch/
 F:     samples/livepatch/
 F:     tools/testing/selftests/livepatch/
 
@@ -12551,13 +12621,6 @@ F:     Documentation/hwmon/lm90.rst
 F:     drivers/hwmon/lm90.c
 F:     include/dt-bindings/thermal/lm90.h
 
-LM95234 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/lm95234.rst
-F:     drivers/hwmon/lm95234.c
-
 LME2510 MEDIA DRIVER
 M:     Malcolm Priestley <tvboxspy@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -12761,12 +12824,13 @@ W:    https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/temperature/adi,ltc2983.yaml
 F:     drivers/iio/temperature/ltc2983.c
 
-LTC4261 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
+LTC4282 HARDWARE MONITOR DRIVER
+M:     Nuno Sa <nuno.sa@analog.com>
 L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/ltc4261.rst
-F:     drivers/hwmon/ltc4261.c
+S:     Supported
+F:     Documentation/devicetree/bindings/hwmon/adi,ltc4282.yaml
+F:     Documentation/hwmon/ltc4282.rst
+F:     drivers/hwmon/ltc4282.c
 
 LTC4286 HARDWARE MONITOR DRIVER
 M:     Delphine CC Chiu <Delphine_CC_Chiu@Wiwynn.com>
@@ -12902,6 +12966,8 @@ M:      Alejandro Colomar <alx@kernel.org>
 L:     linux-man@vger.kernel.org
 S:     Maintained
 W:     http://www.kernel.org/doc/man-pages
+T:     git git://git.kernel.org/pub/scm/docs/man-pages/man-pages.git
+T:     git git://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git
 
 MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
 M:     Jeremy Kerr <jk@codeconstruct.com.au>
@@ -13053,6 +13119,15 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/marvell/octeon_ep
 
+MARVELL OCTEON ENDPOINT VF DRIVER
+M:     Veerasenareddy Burru <vburru@marvell.com>
+M:     Sathesh Edara <sedara@marvell.com>
+M:     Shinas Rasheed <srasheed@marvell.com>
+M:     Satananda Burla <sburla@marvell.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/marvell/octeon_ep_vf
+
 MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
 M:     Sunil Goutham <sgoutham@marvell.com>
 M:     Geetha sowjanya <gakula@marvell.com>
@@ -13113,13 +13188,6 @@ S:     Maintained
 F:     Documentation/hwmon/max15301.rst
 F:     drivers/hwmon/pmbus/max15301.c
 
-MAX16065 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/max16065.rst
-F:     drivers/hwmon/max16065.c
-
 MAX2175 SDR TUNER DRIVER
 M:     Ramesh Shanmugasundaram <rashanmu@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -13130,15 +13198,6 @@ 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:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/hwmon/adi,max31827.yaml
-F:     Documentation/hwmon/max31827.rst
-F:     drivers/hwmon/max31827.c
-
 MAX31335 RTC DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-rtc@vger.kernel.org
@@ -13153,15 +13212,6 @@ S:     Orphan
 F:     Documentation/hwmon/max6650.rst
 F:     drivers/hwmon/max6650.c
 
-MAX6697 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/max6697.txt
-F:     Documentation/hwmon/max6697.rst
-F:     drivers/hwmon/max6697.c
-F:     include/linux/platform_data/max6697.h
-
 MAX9286 QUAD GMSL DESERIALIZER DRIVER
 M:     Jacopo Mondi <jacopo+renesas@jmondi.org>
 M:     Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
@@ -14007,7 +14057,7 @@ F:      include/uapi/rdma/mlx5-abi.h
 
 MELLANOX MLX5 VDPA DRIVER
 M:     Dragos Tatulea <dtatulea@nvidia.com>
-L:     virtualization@lists.linux-foundation.org
+L:     virtualization@lists.linux.dev
 S:     Supported
 F:     drivers/vdpa/mlx5/
 
@@ -14103,6 +14153,17 @@ F:     mm/
 F:     tools/mm/
 F:     tools/testing/selftests/mm/
 
+MEMORY MAPPING
+M:     Andrew Morton <akpm@linux-foundation.org>
+R:     Liam R. Howlett <Liam.Howlett@oracle.com>
+R:     Vlastimil Babka <vbabka@suse.cz>
+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:     mm/mmap.c
+
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:     Miquel Raynal <miquel.raynal@bootlin.com>
 M:     Richard Weinberger <richard@nod.at>
@@ -14361,7 +14422,7 @@ MICROCHIP MCP16502 PMIC DRIVER
 M:     Claudiu Beznea <claudiu.beznea@tuxon.dev>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
-F:     Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
+F:     Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
 F:     drivers/regulator/mcp16502.c
 
 MICROCHIP MCP3564 ADC DRIVER
@@ -14556,6 +14617,14 @@ F:     Documentation/driver-api/surface_aggregator/clients/dtx.rst
 F:     drivers/platform/surface/surface_dtx.c
 F:     include/uapi/linux/surface_aggregator/dtx.h
 
+MICROSOFT SURFACE SENSOR FAN DRIVER
+M:     Maximilian Luz <luzmaximilian@gmail.com>
+M:     Ivor Wanders <ivor@iwanders.net>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/surface_fan.rst
+F:     drivers/hwmon/surface_fan.c
+
 MICROSOFT SURFACE GPE LID SUPPORT DRIVER
 M:     Maximilian Luz <luzmaximilian@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -15060,15 +15129,6 @@ M:     Samuel Mendoza-Jonas <sam@mendozajonas.com>
 S:     Maintained
 F:     net/ncsi/
 
-NCT6775 HARDWARE MONITOR DRIVER - CORE & PLATFORM DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/nct6775.rst
-F:     drivers/hwmon/nct6775-core.c
-F:     drivers/hwmon/nct6775-platform.c
-F:     drivers/hwmon/nct6775.h
-
 NCT6775 HARDWARE MONITOR DRIVER - I2C DRIVER
 M:     Zev Weiss <zev@bewilderbeest.net>
 L:     linux-hwmon@vger.kernel.org
@@ -15080,6 +15140,7 @@ NETDEVSIM
 M:     Jakub Kicinski <kuba@kernel.org>
 S:     Maintained
 F:     drivers/net/netdevsim/*
+F:     tools/testing/selftests/drivers/net/netdevsim/*
 
 NETEM NETWORK EMULATOR
 M:     Stephen Hemminger <stephen@networkplumber.org>
@@ -15177,6 +15238,7 @@ F:      Documentation/networking/net_cachelines/net_device.rst
 F:     drivers/connector/
 F:     drivers/net/
 F:     include/dt-bindings/net/
+F:     include/linux/cn_proc.h
 F:     include/linux/etherdevice.h
 F:     include/linux/fcdevice.h
 F:     include/linux/fddidevice.h
@@ -15184,6 +15246,7 @@ F:      include/linux/hippidevice.h
 F:     include/linux/if_*
 F:     include/linux/inetdevice.h
 F:     include/linux/netdevice.h
+F:     include/uapi/linux/cn_proc.h
 F:     include/uapi/linux/if_*
 F:     include/uapi/linux/netdevice.h
 X:     drivers/net/wireless/
@@ -15232,6 +15295,8 @@ F:      Documentation/networking/
 F:     Documentation/networking/net_cachelines/
 F:     Documentation/process/maintainer-netdev.rst
 F:     Documentation/userspace-api/netlink/
+F:     include/linux/framer/framer-provider.h
+F:     include/linux/framer/framer.h
 F:     include/linux/in.h
 F:     include/linux/indirect_call_wrapper.h
 F:     include/linux/net.h
@@ -15319,7 +15384,7 @@ K:      \bmdo_
 NETWORKING [MPTCP]
 M:     Matthieu Baerts <matttbe@kernel.org>
 M:     Mat Martineau <martineau@kernel.org>
-R:     Geliang Tang <geliang.tang@linux.dev>
+R:     Geliang Tang <geliang@kernel.org>
 L:     netdev@vger.kernel.org
 L:     mptcp@lists.linux.dev
 S:     Maintained
@@ -15566,16 +15631,6 @@ W:     https://github.com/davejiang/linux/wiki
 T:     git https://github.com/davejiang/linux.git
 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/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
-F:     Documentation/filesystems/ntfs.rst
-F:     fs/ntfs/
-
 NTFS3 FILESYSTEM
 M:     Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
 L:     ntfs3@lists.linux.dev
@@ -15704,7 +15759,7 @@ F:      drivers/iio/gyro/fxas21002c_spi.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
-L:     linux-imx@nxp.com
+L:     imx@lists.linux.dev
 S:     Maintained
 F:     Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
 F:     Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
@@ -15741,7 +15796,7 @@ F:      drivers/gpu/drm/imx/dcss/
 NXP i.MX 8QXP ADC DRIVER
 M:     Cai Huoqing <cai.huoqing@linux.dev>
 M:     Haibo Chen <haibo.chen@nxp.com>
-L:     linux-imx@nxp.com
+L:     imx@lists.linux.dev
 L:     linux-iio@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
@@ -15749,7 +15804,7 @@ F:      drivers/iio/adc/imx8qxp-adc.c
 
 NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
 M:     Mirela Rabulea <mirela.rabulea@nxp.com>
-R:     NXP Linux Team <linux-imx@nxp.com>
+L:     imx@lists.linux.dev
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
@@ -15759,7 +15814,7 @@ 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
+L:     imx@lists.linux.dev
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
 F:     Documentation/devicetree/bindings/clock/imx*
@@ -15829,6 +15884,14 @@ S:     Maintained
 F:     Documentation/hwmon/nzxt-kraken2.rst
 F:     drivers/hwmon/nzxt-kraken2.c
 
+NZXT-KRAKEN3 HARDWARE MONITORING DRIVER
+M:     Jonas Malaco <jonas@protocubo.io>
+M:     Aleksa Savic <savicaleksa83@gmail.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/nzxt-kraken3.rst
+F:     drivers/hwmon/nzxt-kraken3.c
+
 NZXT-SMART2 HARDWARE MONITORING DRIVER
 M:     Aleksandr Mezin <mezin.alexander@gmail.com>
 L:     linux-hwmon@vger.kernel.org
@@ -16720,6 +16783,7 @@ F:      drivers/pci/controller/dwc/*layerscape*
 PCI DRIVER FOR FU740
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 M:     Greentime Hu <greentime.hu@sifive.com>
+M:     Samuel Holland <samuel.holland@sifive.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
@@ -16832,6 +16896,7 @@ F:      drivers/pci/controller/dwc/*designware*
 
 PCI DRIVER FOR TI DRA7XX/J721E
 M:     Vignesh Raghavendra <vigneshr@ti.com>
+R:     Siddharth Vadapalli <s-vadapalli@ti.com>
 L:     linux-omap@vger.kernel.org
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -16856,9 +16921,8 @@ 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:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 M:     Krzysztof Wilczyński <kw@linux.com>
-R:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 R:     Kishon Vijay Abraham I <kishon@kernel.org>
 L:     linux-pci@vger.kernel.org
 S:     Supported
@@ -17177,7 +17241,7 @@ R:      John Garry <john.g.garry@oracle.com>
 R:     Will Deacon <will@kernel.org>
 R:     James Clark <james.clark@arm.com>
 R:     Mike Leach <mike.leach@linaro.org>
-R:     Leo Yan <leo.yan@linaro.org>
+R:     Leo Yan <leo.yan@linux.dev>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     tools/build/feature/test-libopencsd.c
@@ -17258,9 +17322,12 @@ M:     Shawn Guo <shawnguo@kernel.org>
 M:     Jacky Bai <ping.bai@nxp.com>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 L:     linux-gpio@vger.kernel.org
+L:     NXP S32 Linux Team <s32@nxp.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/fsl,*
+F:     Documentation/devicetree/bindings/pinctrl/nxp,s32*
 F:     drivers/pinctrl/freescale/
+F:     drivers/pinctrl/nxp/
 
 PIN CONTROLLER - INTEL
 M:     Mika Westerberg <mika.westerberg@linux.intel.com>
@@ -17314,14 +17381,6 @@ S:     Supported
 F:     drivers/gpio/gpio-sama5d2-piobu.c
 F:     drivers/pinctrl/pinctrl-at91*
 
-PIN CONTROLLER - NXP S32
-M:     Chester Lin <clin@suse.com>
-R:     NXP S32 Linux Team <s32@nxp.com>
-L:     linux-gpio@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/pinctrl/nxp,s32*
-F:     drivers/pinctrl/nxp/
-
 PIN CONTROLLER - QUALCOMM
 M:     Bjorn Andersson <andersson@kernel.org>
 L:     linux-arm-msm@vger.kernel.org
@@ -17338,7 +17397,6 @@ F:      Documentation/devicetree/bindings/pinctrl/renesas,*
 F:     drivers/pinctrl/renesas/
 
 PIN CONTROLLER - SAMSUNG
-M:     Tomasz Figa <tomasz.figa@gmail.com>
 M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 R:     Alim Akhtar <alim.akhtar@samsung.com>
@@ -17425,35 +17483,6 @@ 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
-S:     Maintained
-W:     http://hwmon.wiki.kernel.org/
-W:     http://www.roeck-us.net/linux/drivers/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
-F:     Documentation/devicetree/bindings/hwmon/ltc2978.txt
-F:     Documentation/devicetree/bindings/hwmon/max31785.txt
-F:     Documentation/hwmon/adm1275.rst
-F:     Documentation/hwmon/ibm-cffps.rst
-F:     Documentation/hwmon/ir35221.rst
-F:     Documentation/hwmon/lm25066.rst
-F:     Documentation/hwmon/ltc2978.rst
-F:     Documentation/hwmon/ltc3815.rst
-F:     Documentation/hwmon/max16064.rst
-F:     Documentation/hwmon/max20751.rst
-F:     Documentation/hwmon/max31785.rst
-F:     Documentation/hwmon/max34440.rst
-F:     Documentation/hwmon/max8688.rst
-F:     Documentation/hwmon/pmbus-core.rst
-F:     Documentation/hwmon/pmbus.rst
-F:     Documentation/hwmon/tps40422.rst
-F:     Documentation/hwmon/ucd9000.rst
-F:     Documentation/hwmon/ucd9200.rst
-F:     Documentation/hwmon/zl6100.rst
-F:     drivers/hwmon/pmbus/
-F:     include/linux/pmbus.h
-
 PMC SIERRA MaxRAID DRIVER
 L:     linux-scsi@vger.kernel.org
 S:     Orphan
@@ -17488,6 +17517,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 F:     fs/timerfd.c
 F:     include/linux/time_namespace.h
 F:     include/linux/timer*
+F:     include/trace/events/timer*
 F:     kernel/time/*timer*
 F:     kernel/time/namespace.c
 
@@ -17524,6 +17554,7 @@ F:      Documentation/devicetree/bindings/power/supply/
 F:     drivers/power/supply/
 F:     include/linux/power/
 F:     include/linux/power_supply.h
+F:     tools/testing/selftests/power_supply/
 
 POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
 M:     Suraj Jitindar Singh <sjitindarsingh@gmail.com>
@@ -17673,6 +17704,13 @@ F:     fs/pstore/
 F:     include/linux/pstore*
 K:     \b(pstore|ramoops)
 
+PT5161L HARDWARE MONITOR DRIVER
+M:     Cosmo Chou <cosmo.chou@quantatw.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/pt5161l.rst
+F:     drivers/hwmon/pt5161l.c
+
 PTP HARDWARE CLOCK SUPPORT
 M:     Richard Cochran <richardcochran@gmail.com>
 L:     netdev@vger.kernel.org
@@ -17971,33 +18009,34 @@ F:    drivers/media/tuners/qt1010*
 
 QUALCOMM ATH12K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
-M:     Jeff Johnson <quic_jjohnson@quicinc.com>
+M:     Jeff Johnson <jjohnson@kernel.org>
 L:     ath12k@lists.infradead.org
 S:     Supported
 W:     https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 F:     drivers/net/wireless/ath/ath12k/
+N:     ath12k
 
 QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
-M:     Jeff Johnson <quic_jjohnson@quicinc.com>
+M:     Jeff Johnson <jjohnson@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:     Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
 F:     drivers/net/wireless/ath/ath10k/
+N:     ath10k
 
 QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
-M:     Jeff Johnson <quic_jjohnson@quicinc.com>
+M:     Jeff Johnson <jjohnson@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/
+N:     ath11k
 
 QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 M:     Toke Høiland-Jørgensen <toke@toke.dk>
@@ -18008,6 +18047,13 @@ 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/
 
+QUALCOMM ATHEROS QCA7K ETHERNET DRIVER
+M:     Stefan Wahren <wahrenst@gmx.net>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/qca,qca7000.txt
+F:     drivers/net/ethernet/qualcomm/qca*
+
 QUALCOMM BAM-DMUX WWAN NETWORK DRIVER
 M:     Stephan Gerhold <stephan@gerhold.net>
 L:     netdev@vger.kernel.org
@@ -18080,7 +18126,6 @@ F:      drivers/net/ethernet/qualcomm/emac/
 
 QUALCOMM ETHQOS ETHERNET DRIVER
 M:     Vinod Koul <vkoul@kernel.org>
-R:     Bhupesh Sharma <bhupesh.sharma@linaro.org>
 L:     netdev@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -18352,11 +18397,17 @@ M:    Tony Luck <tony.luck@intel.com>
 M:     Borislav Petkov <bp@alien8.de>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
-F:     Documentation/admin-guide/ras.rst
+F:     Documentation/admin-guide/RAS
 F:     drivers/ras/
 F:     include/linux/ras.h
 F:     include/ras/ras_event.h
 
+RAS FRU MEMORY POISON MANAGER (FMPM)
+M:     Yazen Ghannam <Yazen.Ghannam@amd.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/ras/amd/fmpm.c
+
 RC-CORE / LIRC FRAMEWORK
 M:     Sean Young <sean@mess.org>
 L:     linux-media@vger.kernel.org
@@ -18427,7 +18478,7 @@ S:      Supported
 F:     drivers/infiniband/sw/rdmavt
 
 RDS - RELIABLE DATAGRAM SOCKETS
-M:     Santosh Shilimkar <santosh.shilimkar@oracle.com>
+M:     Allison Henderson <allison.henderson@oracle.com>
 L:     netdev@vger.kernel.org
 L:     linux-rdma@vger.kernel.org
 L:     rds-devel@oss.oracle.com (moderated for non-subscribers)
@@ -18846,6 +18897,7 @@ F:      Documentation/devicetree/bindings/riscv/
 F:     arch/riscv/boot/dts/
 X:     arch/riscv/boot/dts/allwinner/
 X:     arch/riscv/boot/dts/renesas/
+X:     arch/riscv/boot/dts/sophgo/
 
 RISC-V PMU DRIVERS
 M:     Atish Patra <atishp@atishpatra.org>
@@ -19094,6 +19146,7 @@ F:      Documentation/rust/
 F:     rust/
 F:     samples/rust/
 F:     scripts/*rust*
+F:     tools/testing/selftests/rust/
 K:     \b(?i:rust)\b
 
 RXRPC SOCKETS (AF_RXRPC)
@@ -19387,7 +19440,6 @@ F:      drivers/media/platform/samsung/exynos4-is/
 SAMSUNG SOC CLOCK DRIVERS
 M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
-M:     Tomasz Figa <tomasz.figa@gmail.com>
 M:     Chanwoo Choi <cw00.choi@samsung.com>
 R:     Alim Akhtar <alim.akhtar@samsung.com>
 L:     linux-samsung-soc@vger.kernel.org
@@ -19629,7 +19681,7 @@ 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:     imx@lists.linux.dev
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/sdhci-esdhc-imx.c
@@ -19964,36 +20016,15 @@ S:    Maintained
 F:     drivers/watchdog/simatic-ipc-wdt.c
 
 SIFIVE DRIVERS
-M:     Palmer Dabbelt <palmer@dabbelt.com>
 M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Samuel Holland <samuel.holland@sifive.com>
 L:     linux-riscv@lists.infradead.org
 S:     Supported
+F:     drivers/dma/sf-pdma/
 N:     sifive
+K:     fu[57]40
 K:     [^@]sifive
 
-SIFIVE CACHE DRIVER
-M:     Conor Dooley <conor@kernel.org>
-L:     linux-riscv@lists.infradead.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
-F:     drivers/cache/sifive_ccache.c
-
-SIFIVE FU540 SYSTEM-ON-CHIP
-M:     Paul Walmsley <paul.walmsley@sifive.com>
-M:     Palmer Dabbelt <palmer@dabbelt.com>
-L:     linux-riscv@lists.infradead.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git
-N:     fu540
-K:     fu540
-
-SIFIVE PDMA DRIVER
-M:     Green Wan <green.wan@sifive.com>
-S:     Maintained
-F:     Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
-F:     drivers/dma/sf-pdma/
-
-
 SILEAD TOUCHSCREEN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-input@vger.kernel.org
@@ -20202,8 +20233,8 @@ F:      Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
 F:     drivers/net/ethernet/socionext/sni_ave.c
 
 SOCIONEXT (SNI) NETSEC NETWORK DRIVER
-M:     Jassi Brar <jaswinder.singh@linaro.org>
 M:     Ilias Apalodimas <ilias.apalodimas@linaro.org>
+M:     Masahisa Kojima <kojima.masahisa@socionext.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml
@@ -20444,12 +20475,13 @@ F:    drivers/char/sonypi.c
 F:     drivers/platform/x86/sony-laptop.c
 F:     include/linux/sony-laptop.h
 
-SOPHGO DEVICETREES
-M:     Chao Wei <chao.wei@sophgo.com>
+SOPHGO DEVICETREES and DRIVERS
 M:     Chen Wang <unicorn_wang@outlook.com>
+M:     Inochi Amaoto <inochiama@outlook.com>
+T:     git https://github.com/sophgo/linux.git
 S:     Maintained
-F:     arch/riscv/boot/dts/sophgo/
-F:     Documentation/devicetree/bindings/riscv/sophgo.yaml
+N:     sophgo
+K:     sophgo
 
 SOUND
 M:     Jaroslav Kysela <perex@perex.cz>
@@ -20548,6 +20580,7 @@ F:      Documentation/translations/sp_SP/
 
 SPARC + UltraSPARC (sparc/sparc64)
 M:     "David S. Miller" <davem@davemloft.net>
+M:     Andreas Larsson <andreas@gaisler.com>
 L:     sparclinux@vger.kernel.org
 S:     Maintained
 Q:     http://patchwork.ozlabs.org/project/sparclinux/list/
@@ -20955,6 +20988,12 @@ F:     Documentation/devicetree/bindings/phy/starfive,jh7110-usb-phy.yaml
 F:     drivers/phy/starfive/phy-jh7110-pcie.c
 F:     drivers/phy/starfive/phy-jh7110-usb.c
 
+STARFIVE JH8100 EXTERNAL INTERRUPT CONTROLLER DRIVER
+M:     Changhuang Liang <changhuang.liang@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/interrupt-controller/starfive,jh8100-intc.yaml
+F:     drivers/irqchip/irq-starfive-jh8100-intc.c
+
 STATIC BRANCH/CALL
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Josh Poimboeuf <jpoimboe@kernel.org>
@@ -21320,6 +21359,7 @@ F:      drivers/clk/clk-sc[mp]i.c
 F:     drivers/cpufreq/sc[mp]i-cpufreq.c
 F:     drivers/firmware/arm_scmi/
 F:     drivers/firmware/arm_scpi.c
+F:     drivers/hwmon/scmi-hwmon.c
 F:     drivers/pmdomain/arm/
 F:     drivers/powercap/arm_scmi_powercap.c
 F:     drivers/regulator/scmi-regulator.c
@@ -21514,7 +21554,7 @@ 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
+L:     tech-board-discuss@lists.linux.dev
 S:     Maintained
 F:     Documentation/process/contribution-maturity-model.rst
 F:     Documentation/process/researcher-guidelines.rst
@@ -22004,6 +22044,14 @@ F:     Documentation/devicetree/bindings/media/i2c/ti,ds90*
 F:     drivers/media/i2c/ds90*
 F:     include/media/i2c/ds90*
 
+TI HDC302X HUMIDITY DRIVER
+M:     Javier Carrasco <javier.carrasco.cruz@gmail.com>
+M:     Li peiyu <579lpy@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml
+F:     drivers/iio/humidity/hdc3020.c
+
 TI ICSSG ETHERNET DRIVER (ICSSG)
 R:     MD Danish Anwar <danishanwar@ti.com>
 R:     Roger Quadros <rogerq@kernel.org>
@@ -22150,22 +22198,6 @@ F:     drivers/mmc/host/renesas_sdhi*
 F:     drivers/mmc/host/tmio_mmc*
 F:     include/linux/mfd/tmio.h
 
-TMP401 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml
-F:     Documentation/hwmon/tmp401.rst
-F:     drivers/hwmon/tmp401.c
-
-TMP464 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml
-F:     Documentation/hwmon/tmp464.rst
-F:     drivers/hwmon/tmp464.c
-
 TMP513 HARDWARE MONITOR DRIVER
 M:     Eric Tremblay <etremblay@distech-controls.com>
 L:     linux-hwmon@vger.kernel.org
@@ -22470,6 +22502,23 @@ F:     Documentation/block/ublk.rst
 F:     drivers/block/ublk_drv.c
 F:     include/uapi/linux/ublk_cmd.h
 
+UBSAN
+M:     Kees Cook <keescook@chromium.org>
+R:     Marco Elver <elver@google.com>
+R:     Andrey Konovalov <andreyknvl@gmail.com>
+R:     Andrey Ryabinin <ryabinin.a.a@gmail.com>
+L:     kasan-dev@googlegroups.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/hardening
+F:     Documentation/dev-tools/ubsan.rst
+F:     include/linux/ubsan.h
+F:     lib/Kconfig.ubsan
+F:     lib/test_ubsan.c
+F:     lib/ubsan.c
+F:     scripts/Makefile.ubsan
+K:     \bARCH_HAS_UBSAN\b
+
 UCLINUX (M68KNOMMU AND COLDFIRE)
 M:     Greg Ungerer <gerg@linux-m68k.org>
 L:     linux-m68k@lists.linux-m68k.org
@@ -22859,9 +22908,8 @@ S:      Maintained
 F:     drivers/usb/typec/mux/pi3usb30532.c
 
 USB TYPEC PORT CONTROLLER DRIVERS
-M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-usb@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/usb/typec/tcpm/
 
 USB UHCI DRIVER
@@ -23073,7 +23121,7 @@ F:      drivers/vfio/pci/mlx5/
 VFIO VIRTIO PCI DRIVER
 M:     Yishai Hadas <yishaih@nvidia.com>
 L:     kvm@vger.kernel.org
-L:     virtualization@lists.linux-foundation.org
+L:     virtualization@lists.linux.dev
 S:     Maintained
 F:     drivers/vfio/pci/virtio
 
@@ -24117,14 +24165,13 @@ F:    drivers/net/ethernet/xilinx/xilinx_axienet*
 
 XILINX CAN DRIVER
 M:     Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>
-R:     Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
 L:     linux-can@vger.kernel.org
 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>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 F:     drivers/soc/xilinx/xlnx_event_manager.c
 F:     include/linux/firmware/xlnx-event-manager.h
@@ -24338,13 +24385,6 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
 F:     Documentation/filesystems/zonefs.rst
 F:     fs/zonefs/
 
-ZPOOL COMPRESSED PAGE STORAGE API
-M:     Dan Streetman <ddstreet@ieee.org>
-L:     linux-mm@kvack.org
-S:     Maintained
-F:     include/linux/zpool.h
-F:     mm/zpool.c
-
 ZR36067 VIDEO FOR LINUX DRIVER
 M:     Corentin Labbe <clabbe@baylibre.com>
 L:     mjpeg-users@lists.sourceforge.net
@@ -24396,7 +24436,9 @@ M:      Nhat Pham <nphamcs@gmail.com>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/admin-guide/mm/zswap.rst
+F:     include/linux/zpool.h
 F:     include/linux/zswap.h
+F:     mm/zpool.c
 F:     mm/zswap.c
 
 THE REST