Merge git://git.kernel.org:/pub/scm/linux/kernel/git/davem/sparc

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 45a23d6af6cc08928c6553e095f29ecc7541de0c..d92f85ca831d30d658fef768575ba538be4d4b93 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -261,6 +261,8 @@ ABI/API
 L:     [email protected]
 F:     include/linux/syscalls.h
 F:     kernel/sys_ni.c
+F:     include/uapi/
+F:     arch/*/include/uapi/
 
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 M:     Hans de Goede <[email protected]>
@@ -436,6 +438,15 @@ S: Orphan
 F:     drivers/platform/x86/wmi.c
 F:     include/uapi/linux/wmi.h
 
+ACRN HYPERVISOR SERVICE MODULE
+M:     Shuo Liu <[email protected]>
+L:     [email protected] (subscribers-only)
+S:     Supported
+W:     https://projectacrn.org
+F:     Documentation/virt/acrn/
+F:     drivers/virt/acrn/
+F:     include/uapi/linux/acrn.h
+
 AD1889 ALSA SOUND DRIVER
 L:     [email protected]
 S:     Maintained
@@ -699,7 +710,8 @@ M:  Michael Tretter <[email protected]>
 R:     Pengutronix Kernel Team <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/staging/media/allegro-dvt/
+F:     Documentation/devicetree/bindings/media/allegro,al5e.yaml
+F:     drivers/media/platform/allegro-dvt/
 
 ALLWINNER A10 CSI DRIVER
 M:     Maxime Ripard <[email protected]>
@@ -820,7 +832,6 @@ M:  Netanel Belgazal <[email protected]>
 M:     Arthur Kiyanovski <[email protected]>
 R:     Guy Tzalik <[email protected]>
 R:     Saeed Bishara <[email protected]>
-R:     Zorik Machulsky <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     Documentation/networking/device_drivers/ethernet/amazon/ena.rst
@@ -907,7 +918,7 @@ AMD KFD
 M:     Felix Kuehling <[email protected]>
 L:     [email protected]
 S:     Supported
-T:     git git://people.freedesktop.org/~agd5f/linux
+T:     git https://gitlab.freedesktop.org/agd5f/linux.git
 F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]
 F:     drivers/gpu/drm/amd/amdkfd/
 F:     drivers/gpu/drm/amd/include/cik_structs.h
@@ -1017,7 +1028,7 @@ F:        Documentation/devicetree/bindings/mux/adi,adgs1408.txt
 F:     drivers/mux/adgs1408.c
 
 ANALOG DEVICES INC ADIN DRIVER
-M:     Alexandru Ardelean <alexaundru.ardelean@analog.com>
+M:     Michael Hennerich <michael.hennerich@analog.com>
 L:     [email protected]
 S:     Supported
 W:     http://ez.analog.com/community/linux-device-drivers
@@ -1025,7 +1036,7 @@ F:        Documentation/devicetree/bindings/net/adi,adin.yaml
 F:     drivers/net/phy/adin.c
 
 ANALOG DEVICES INC ADIS DRIVER LIBRARY
-M:     Alexandru Ardelean <alexandru.ardelean@analog.com>
+M:     Nuno Sa <nuno.sa@analog.com>
 L:     [email protected]
 S:     Supported
 F:     drivers/iio/imu/adis.c
@@ -1414,7 +1425,6 @@ F:        arch/arm*/include/asm/hw_breakpoint.h
 F:     arch/arm*/include/asm/perf_event.h
 F:     arch/arm*/kernel/hw_breakpoint.c
 F:     arch/arm*/kernel/perf_*
-F:     arch/arm/oprofile/common.c
 F:     drivers/perf/
 F:     include/linux/perf/arm_pmu.h
 
@@ -1512,6 +1522,7 @@ ARM/ACTIONS SEMI ARCHITECTURE
 M:     Andreas Färber <[email protected]>
 M:     Manivannan Sadhasivam <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
+L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/actions.yaml
 F:     Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
@@ -1779,19 +1790,6 @@ F:       drivers/net/ethernet/cortina/
 F:     drivers/pinctrl/pinctrl-gemini.c
 F:     drivers/rtc/rtc-ftrtc010.c
 
-ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
-M:     Barry Song <[email protected]>
-L:     [email protected] (moderated for non-subscribers)
-S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
-F:     arch/arm/boot/dts/prima2*
-F:     arch/arm/mach-prima2/
-F:     drivers/clk/sirf/
-F:     drivers/clocksource/timer-atlas7.c
-F:     drivers/clocksource/timer-prima2.c
-X:     drivers/gnss
-N:     [^a-z]sirf
-
 ARM/CZ.NIC TURRIS MOX SUPPORT
 M:     Marek Behun <[email protected]>
 S:     Maintained
@@ -1807,13 +1805,6 @@ F:       drivers/firmware/turris-mox-rwtm.c
 F:     drivers/gpio/gpio-moxtet.c
 F:     include/linux/moxtet.h
 
-ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
-M:     Uwe Kleine-König <[email protected]>
-R:     Pengutronix Kernel Team <[email protected]>
-L:     [email protected] (moderated for non-subscribers)
-S:     Maintained
-N:     efm32
-
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 M:     Robert Jarzmik <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -2091,7 +2082,7 @@ M:        Chunfeng Yun <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/phy/phy-mtk-*
+F:     Documentation/devicetree/bindings/phy/mediatek,*
 F:     drivers/phy/mediatek/
 
 ARM/Microchip (AT91) SoC support
@@ -2146,17 +2137,20 @@ L:      [email protected] (moderated for non-subscribers)
 S:     Maintained
 W:     http://linux-chenxing.org/
 F:     Documentation/devicetree/bindings/arm/mstar/*
+F:     Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml
 F:     Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
 F:     arch/arm/boot/dts/mstar-*
 F:     arch/arm/mach-mstar/
+F:     drivers/clk/mstar/
 F:     drivers/gpio/gpio-msc313.c
+F:     include/dt-bindings/clock/mstar-*
 F:     include/dt-bindings/gpio/msc313-gpio.h
 
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 M:     Michael Petchkovsky <[email protected]>
 S:     Maintained
 
-ARM/NOMADIK/U300/Ux500 ARCHITECTURES
+ARM/NOMADIK/Ux500 ARCHITECTURES
 M:     Linus Walleij <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
@@ -2165,35 +2159,23 @@ F:      Documentation/devicetree/bindings/arm/ste-*
 F:     Documentation/devicetree/bindings/arm/ux500.yaml
 F:     Documentation/devicetree/bindings/arm/ux500/
 F:     Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
-F:     Documentation/devicetree/bindings/i2c/i2c-stu300.txt
 F:     arch/arm/boot/dts/ste-*
 F:     arch/arm/mach-nomadik/
-F:     arch/arm/mach-u300/
 F:     arch/arm/mach-ux500/
 F:     drivers/clk/clk-nomadik.c
-F:     drivers/clk/clk-u300.c
 F:     drivers/clocksource/clksrc-dbx500-prcmu.c
-F:     drivers/clocksource/timer-u300.c
-F:     drivers/dma/coh901318*
 F:     drivers/dma/ste_dma40*
 F:     drivers/hwspinlock/u8500_hsem.c
 F:     drivers/i2c/busses/i2c-nomadik.c
-F:     drivers/i2c/busses/i2c-stu300.c
 F:     drivers/iio/adc/ab8500-gpadc.c
-F:     drivers/mfd/ab3100*
 F:     drivers/mfd/ab8500*
 F:     drivers/mfd/abx500*
 F:     drivers/mfd/db8500*
 F:     drivers/mfd/dbx500*
 F:     drivers/pinctrl/nomadik/
-F:     drivers/pinctrl/pinctrl-coh901*
-F:     drivers/pinctrl/pinctrl-u300.c
-F:     drivers/rtc/rtc-ab3100.c
 F:     drivers/rtc/rtc-ab8500.c
-F:     drivers/rtc/rtc-coh901331.c
 F:     drivers/rtc/rtc-pl031.c
 F:     drivers/soc/ux500/
-F:     drivers/watchdog/coh901327_wdt.c
 
 ARM/NUVOTON NPCM ARCHITECTURE
 M:     Avi Fishman <[email protected]>
@@ -2415,6 +2397,8 @@ F:        drivers/*/*s5pv210*
 F:     drivers/memory/samsung/
 F:     drivers/soc/samsung/
 F:     drivers/tty/serial/samsung*
+F:     include/linux/platform_data/*s3c*
+F:     include/linux/serial_s3c.h
 F:     include/linux/soc/samsung/
 N:     exynos
 N:     s3c2410
@@ -2558,13 +2542,6 @@ F:       arch/arm/boot/dts/berlin*
 F:     arch/arm/mach-berlin/
 F:     arch/arm64/boot/dts/synaptics/
 
-ARM/TANGO ARCHITECTURE
-M:     Marc Gonzalez <[email protected]>
-M:     Mans Rullgard <[email protected]>
-L:     [email protected]
-S:     Odd Fixes
-N:     tango
-
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:     Lennert Buytenhek <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -2617,8 +2594,8 @@ S:        Maintained
 F:     drivers/power/reset/keystone-reset.c
 
 ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
-M:     Tero Kristo <[email protected]>
 M:     Nishanth Menon <[email protected]>
+M:     Tero Kristo <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Supported
 F:     Documentation/devicetree/bindings/arm/ti/k3.yaml
@@ -2642,9 +2619,15 @@ L:       [email protected] (moderated for non-subscribers)
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
 F:     Documentation/devicetree/bindings/arm/toshiba.yaml
+F:     Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
+F:     Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
 F:     Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
+F:     Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
 F:     arch/arm64/boot/dts/toshiba/
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
+F:     drivers/gpio/gpio-visconti.c
 F:     drivers/pinctrl/visconti/
+F:     drivers/watchdog/visconti_wdt.c
 N:     visconti
 
 ARM/UNIPHIER ARCHITECTURE
@@ -2724,40 +2707,6 @@ S:       Maintained
 F:     arch/arm/mach-pxa/include/mach/z2.h
 F:     arch/arm/mach-pxa/z2.c
 
-ARM/ZTE ARCHITECTURE
-M:     Jun Nie <[email protected]>
-M:     Shawn Guo <[email protected]>
-L:     [email protected] (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/arm/zte.yaml
-F:     Documentation/devicetree/bindings/clock/zx2967*.txt
-F:     Documentation/devicetree/bindings/dma/zxdma.txt
-F:     Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
-F:     Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
-F:     Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
-F:     Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
-F:     Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
-F:     Documentation/devicetree/bindings/soc/zte/
-F:     Documentation/devicetree/bindings/sound/zte,*.txt
-F:     Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
-F:     Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
-F:     arch/arm/boot/dts/zx2967*
-F:     arch/arm/mach-zx/
-F:     arch/arm64/boot/dts/zte/
-F:     drivers/clk/zte/
-F:     drivers/dma/zx_dma.c
-F:     drivers/gpio/gpio-zx.c
-F:     drivers/i2c/busses/i2c-zx2967.c
-F:     drivers/mmc/host/dw_mmc-zx.*
-F:     drivers/pinctrl/zte/
-F:     drivers/soc/zte/
-F:     drivers/thermal/zx2967_thermal.c
-F:     drivers/watchdog/zx2967_wdt.c
-F:     include/dt-bindings/clock/zx2967*.h
-F:     include/dt-bindings/soc/zte,*.h
-F:     sound/soc/codecs/zx_aud96p22.c
-F:     sound/soc/zte/
-
 ARM/ZYNQ ARCHITECTURE
 M:     Michal Simek <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -2766,6 +2715,7 @@ W:        http://wiki.xilinx.com
 T:     git https://github.com/Xilinx/linux-xlnx.git
 F:     Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
 F:     Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
+F:     Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
 F:     arch/arm/mach-zynq/
 F:     drivers/block/xsysace.c
 F:     drivers/clocksource/timer-cadence-ttc.c
@@ -2788,6 +2738,14 @@ F:       arch/arm64/
 F:     tools/testing/selftests/arm64/
 X:     arch/arm64/boot/dts/
 
+ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
+M:     George McCollister <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
+F:     drivers/net/dsa/xrs700x/*
+F:     net/dsa/tag_xrs700x.c
+
 AS3645A LED FLASH CONTROLLER DRIVER
 M:     Sakari Ailus <[email protected]>
 L:     [email protected]
@@ -2833,6 +2791,15 @@ F:       Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.
 F:     drivers/irqchip/irq-aspeed-scu-ic.c
 F:     include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
 
+ASPEED SD/MMC DRIVER
+M:     Andrew Jeffery <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+L:     [email protected] (moderated for non-subscribers)
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
+F:     drivers/mmc/host/sdhci-of-aspeed*
+
 ASPEED VIDEO ENGINE DRIVER
 M:     Eddie James <[email protected]>
 L:     [email protected]
@@ -2872,9 +2839,7 @@ S:        Odd fixes
 W:     http://sourceforge.net/projects/xscaleiop
 F:     Documentation/crypto/async-tx-api.rst
 F:     crypto/async_tx/
-F:     drivers/dma/
 F:     include/linux/async_tx.h
-F:     include/linux/dmaengine.h
 
 AT24 EEPROM DRIVER
 M:     Bartosz Golaszewski <[email protected]>
@@ -2942,7 +2907,6 @@ S:        Maintained
 F:     drivers/hwmon/asus_atk0110.c
 
 ATLX ETHERNET DRIVERS
-M:     Jay Cliburn <[email protected]>
 M:     Chris Snook <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -3020,7 +2984,7 @@ F:        include/uapi/linux/audit.h
 F:     kernel/audit*
 
 AUXILIARY DISPLAY DRIVERS
-M:     Miguel Ojeda Sandonis <[email protected]>
+M:     Miguel Ojeda <[email protected]>
 S:     Maintained
 F:     drivers/auxdisplay/
 F:     include/linux/cfag12864b.h
@@ -3241,6 +3205,7 @@ L:        [email protected]
 S:     Supported
 W:     http://sourceforge.net/projects/bonding/
 F:     drivers/net/bonding/
+F:     include/net/bonding.h
 F:     include/uapi/linux/if_bonding.h
 
 BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
@@ -3336,7 +3301,7 @@ F:        arch/riscv/net/
 X:     arch/riscv/net/bpf_jit_comp64.c
 
 BPF JIT for RISC-V (64-bit)
-M:     Björn Töpel <bjorn[email protected]>
+M:     Björn Töpel <bjorn@kernel.org>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
@@ -3400,6 +3365,7 @@ L:        [email protected] (subscribers-only)
 S:     Supported
 F:     Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
 F:     drivers/net/dsa/b53/*
+F:     include/linux/dsa/brcm.h
 F:     include/linux/platform_data/b53.h
 
 BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
@@ -3413,7 +3379,7 @@ F:        Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:     drivers/pci/controller/pcie-brcmstb.c
 F:     drivers/staging/vc04_services
 N:     bcm2711
-N:     bcm2835
+N:     bcm283*
 
 BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 M:     Florian Fainelli <[email protected]>
@@ -3437,6 +3403,15 @@ F:       Documentation/devicetree/bindings/mips/brcm/
 F:     arch/mips/bcm47xx/*
 F:     arch/mips/include/asm/mach-bcm47xx/*
 
+BROADCOM BCM4908 ETHERNET DRIVER
+M:     Rafał Miłecki <[email protected]>
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
+F:     drivers/net/ethernet/broadcom/bcm4908_enet.*
+F:     drivers/net/ethernet/broadcom/unimac.h
+
 BROADCOM BCM5301X ARM ARCHITECTURE
 M:     Hauke Mehrtens <[email protected]>
 M:     Rafał Miłecki <[email protected]>
@@ -3625,6 +3600,7 @@ S:        Supported
 F:     Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
 F:     Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
 F:     drivers/net/ethernet/broadcom/genet/
+F:     drivers/net/ethernet/broadcom/unimac.h
 F:     drivers/net/mdio/mdio-bcm-unimac.c
 F:     include/linux/platform_data/bcmgenet.h
 F:     include/linux/platform_data/mdio-bcm-unimac.h
@@ -3658,6 +3634,15 @@ N:       bcm88312
 N:     hr2
 N:     stingray
 
+BROADCOM IPROC GBIT ETHERNET DRIVER
+M:     Rafał Miłecki <[email protected]>
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/brcm,amac.txt
+F:     drivers/net/ethernet/broadcom/bgmac*
+F:     drivers/net/ethernet/broadcom/unimac.h
+
 BROADCOM KONA GPIO DRIVER
 M:     Ray Jui <[email protected]>
 L:     [email protected]
@@ -3683,6 +3668,16 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/firmware/broadcom/*
 
+BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
+M:     Rafał Miłecki <[email protected]>
+M:     Florian Fainelli <[email protected]>
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+T:     git git://github.com/broadcom/stblinux.git
+F:     drivers/soc/bcm/bcm-pmb.c
+F:     include/dt-bindings/soc/bcm-pmb.h
+
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 M:     Rafał Miłecki <[email protected]>
 L:     [email protected]
@@ -3737,6 +3732,7 @@ L:        [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bcmsysport.*
+F:     drivers/net/ethernet/broadcom/unimac.h
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:     Siva Reddy Kallam <[email protected]>
@@ -3746,6 +3742,13 @@ L:       [email protected]
 S:     Supported
 F:     drivers/net/ethernet/broadcom/tg3.*
 
+BROADCOM VK DRIVER
+M:     Scott Branden <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     drivers/misc/bcm-vk/
+F:     include/uapi/linux/misc/bcm_vk.h
+
 BROCADE BFA FC SCSI DRIVER
 M:     Anil Gurumurthy <[email protected]>
 M:     Sudarsana Kalluru <[email protected]>
@@ -3844,14 +3847,6 @@ F:       drivers/irqchip/irq-csky-*
 N:     csky
 K:     csky
 
-C6X ARCHITECTURE
-M:     Mark Salter <[email protected]>
-M:     Aurelien Jacquiot <[email protected]>
-L:     [email protected]
-S:     Maintained
-W:     http://www.linux-c6x.org/wiki/index.php/Main_Page
-F:     arch/c6x/
-
 CA8210 IEEE-802.15.4 RADIO DRIVER
 M:     Harry Morris <[email protected]>
 L:     [email protected]
@@ -3860,6 +3855,29 @@ W:       https://github.com/Cascoda/ca8210-linux.git
 F:     Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
 F:     drivers/net/ieee802154/ca8210.c
 
+CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
+M:     Damien Le Moal <[email protected]>
+L:     [email protected]
+L:     [email protected] (pinctrl driver)
+F:     Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
+F:     drivers/pinctrl/pinctrl-k210.c
+
+CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
+M:     Damien Le Moal <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml
+F:     drivers/reset/reset-k210.c
+
+CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
+M:     Damien Le Moal <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
+F:     drivers/soc/canaan/
+F:     include/soc/canaan/
+
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:     David Howells <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -3881,7 +3899,7 @@ F:        Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
 F:     drivers/mtd/nand/raw/cadence-nand-controller.c
 
 CADENCE USB3 DRD IP DRIVER
-M:     Peter Chen <peter.chen@nxp.com>
+M:     Peter Chen <peter.chen@kernel.org>
 M:     Pawel Laszczak <[email protected]>
 R:     Roger Quadros <[email protected]>
 R:     Aswath Govindraju <[email protected]>
@@ -3890,6 +3908,15 @@ S:       Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 F:     Documentation/devicetree/bindings/usb/cdns,usb3.yaml
 F:     drivers/usb/cdns3/
+X:     drivers/usb/cdns3/cdnsp*
+
+CADENCE USBSSP DRD IP DRIVER
+M:     Pawel Laszczak <[email protected]>
+L:     [email protected]
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
+F:     drivers/usb/cdns3/
+X:     drivers/usb/cdns3/cdns3*
 
 CADET FM/AM RADIO RECEIVER DRIVER
 M:     Hans Verkuil <[email protected]>
@@ -3931,8 +3958,10 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 F:     Documentation/devicetree/bindings/net/can/
 F:     drivers/net/can/
+F:     include/linux/can/bittiming.h
 F:     include/linux/can/dev.h
 F:     include/linux/can/led.h
+F:     include/linux/can/length.h
 F:     include/linux/can/platform/
 F:     include/linux/can/rx-offload.h
 F:     include/uapi/linux/can/error.h
@@ -3948,6 +3977,7 @@ W:        https://github.com/linux-can
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 F:     Documentation/networking/can.rst
+F:     include/linux/can/can-ml.h
 F:     include/linux/can/core.h
 F:     include/linux/can/skb.h
 F:     include/net/netns/can.h
@@ -4083,7 +4113,6 @@ W:        http://www.ibm.com/developerworks/power/cell/
 F:     arch/powerpc/include/asm/cell*.h
 F:     arch/powerpc/include/asm/spu*.h
 F:     arch/powerpc/include/uapi/asm/spu*.h
-F:     arch/powerpc/oprofile/*cell*
 F:     arch/powerpc/platforms/cell/
 
 CELLWISE CW2015 BATTERY DRIVER
@@ -4124,13 +4153,13 @@ F:      scripts/extract-cert.c
 F:     scripts/sign-file.c
 
 CFAG12864B LCD DRIVER
-M:     Miguel Ojeda Sandonis <[email protected]>
+M:     Miguel Ojeda <[email protected]>
 S:     Maintained
 F:     drivers/auxdisplay/cfag12864b.c
 F:     include/linux/cfag12864b.h
 
 CFAG12864BFB LCD FRAMEBUFFER DRIVER
-M:     Miguel Ojeda Sandonis <[email protected]>
+M:     Miguel Ojeda <[email protected]>
 S:     Maintained
 F:     drivers/auxdisplay/cfag12864bfb.c
 F:     include/linux/cfag12864b.h
@@ -4163,7 +4192,7 @@ S:        Maintained
 F:     Documentation/translations/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
-M:     Peter Chen <[email protected]>
+M:     Peter Chen <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
@@ -4300,12 +4329,12 @@ S:      Supported
 F:     drivers/infiniband/hw/usnic/
 
 CLANG-FORMAT FILE
-M:     Miguel Ojeda <[email protected]>
+M:     Miguel Ojeda <[email protected]>
 S:     Maintained
 F:     .clang-format
 
 CLANG/LLVM BUILD SUPPORT
-M:     Nathan Chancellor <nat[email protected]>
+M:     Nathan Chancellor <nat[email protected]>
 M:     Nick Desaulniers <[email protected]>
 L:     [email protected]
 S:     Supported
@@ -4313,8 +4342,8 @@ W:        https://clangbuiltlinux.github.io/
 B:     https://github.com/ClangBuiltLinux/linux/issues
 C:     irc://chat.freenode.net/clangbuiltlinux
 F:     Documentation/kbuild/llvm.rst
+F:     include/linux/compiler-clang.h
 F:     scripts/clang-tools/
-F:     scripts/lld-version.sh
 K:     \b(?i:clang|llvm)\b
 
 CLEANCACHE API
@@ -4440,10 +4469,21 @@ S:      Maintained
 F:     drivers/platform/x86/compal-laptop.c
 
 COMPILER ATTRIBUTES
-M:     Miguel Ojeda <[email protected]>
+M:     Miguel Ojeda <[email protected]>
 S:     Maintained
 F:     include/linux/compiler_attributes.h
 
+COMPUTE EXPRESS LINK (CXL)
+M:     Alison Schofield <[email protected]>
+M:     Vishal Verma <[email protected]>
+M:     Ira Weiny <[email protected]>
+M:     Ben Widawsky <[email protected]>
+M:     Dan Williams <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/cxl/
+F:     include/uapi/linux/cxl_mem.h
+
 CONEXANT ACCESSRUNNER USB DRIVER
 L:     [email protected]
 S:     Orphan
@@ -4467,7 +4507,7 @@ F:        include/linux/console*
 
 CONTROL GROUP (CGROUP)
 M:     Tejun Heo <[email protected]>
-M:     Li Zefan <lizefan@huawei.com>
+M:     Zefan Li <lizefan.x@bytedance.com>
 M:     Johannes Weiner <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -4491,11 +4531,9 @@ F:       block/blk-throttle.c
 F:     include/linux/blk-cgroup.h
 
 CONTROL GROUP - CPUSET
-M:     Li Zefan <lizefan@huawei.com>
+M:     Zefan Li <lizefan.x@bytedance.com>
 L:     [email protected]
 S:     Maintained
-W:     http://www.bullopensource.org/cpuset/
-W:     http://oss.sgi.com/projects/cpusets/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 F:     Documentation/admin-guide/cgroup-v1/cpusets.rst
 F:     include/linux/cpuset.h
@@ -4623,6 +4661,7 @@ L:        [email protected]
 S:     Supported
 F:     arch/arm/mach-exynos/pm.c
 F:     drivers/cpuidle/cpuidle-exynos.c
+F:     include/linux/platform_data/cpuidle-exynos.h
 
 CPUIDLE DRIVER - ARM PSCI
 M:     Lorenzo Pieralisi <[email protected]>
@@ -4922,9 +4961,8 @@ F:        Documentation/scsi/dc395x.rst
 F:     drivers/scsi/dc395x.*
 
 DCCP PROTOCOL
-M:     Gerrit Renker <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Orphan
 W:     http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
 F:     include/linux/dccp.h
 F:     include/linux/tfrc.h
@@ -4939,7 +4977,7 @@ F:        Documentation/networking/decnet.rst
 F:     net/decnet/
 
 DECSTATION PLATFORM SUPPORT
-M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 L:     [email protected]
 S:     Maintained
 W:     http://www.linux-mips.org/wiki/DECstation
@@ -4948,12 +4986,12 @@ F:      arch/mips/include/asm/dec/
 F:     arch/mips/include/asm/mach-dec/
 
 DEFXX FDDI NETWORK DRIVER
-M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 S:     Maintained
 F:     drivers/net/fddi/defxx.*
 
 DEFZA FDDI NETWORK DRIVER
-M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 S:     Maintained
 F:     drivers/net/fddi/defza.*
 
@@ -4970,17 +5008,17 @@ M:      Matthew Garrett <[email protected]>
 M:     Pali Rohár <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/platform/x86/dell-laptop.c
+F:     drivers/platform/x86/dell/dell-laptop.c
 
 DELL LAPTOP FREEFALL DRIVER
 M:     Pali Rohár <[email protected]>
 S:     Maintained
-F:     drivers/platform/x86/dell-smo8800.c
+F:     drivers/platform/x86/dell/dell-smo8800.c
 
 DELL LAPTOP RBTN DRIVER
 M:     Pali Rohár <[email protected]>
 S:     Maintained
-F:     drivers/platform/x86/dell-rbtn.*
+F:     drivers/platform/x86/dell/dell-rbtn.*
 
 DELL LAPTOP SMM DRIVER
 M:     Pali Rohár <[email protected]>
@@ -4992,26 +5030,26 @@ DELL REMOTE BIOS UPDATE DRIVER
 M:     Stuart Hayes <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/platform/x86/dell_rbu.c
+F:     drivers/platform/x86/dell/dell_rbu.c
 
 DELL SMBIOS DRIVER
 M:     Pali Rohár <[email protected]>
 M:     Mario Limonciello <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/platform/x86/dell-smbios.*
+F:     drivers/platform/x86/dell/dell-smbios.*
 
 DELL SMBIOS SMM DRIVER
 M:     Mario Limonciello <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/platform/x86/dell-smbios-smm.c
+F:     drivers/platform/x86/dell/dell-smbios-smm.c
 
 DELL SMBIOS WMI DRIVER
 M:     Mario Limonciello <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/platform/x86/dell-smbios-wmi.c
+F:     drivers/platform/x86/dell/dell-smbios-wmi.c
 F:     tools/wmi/dell-smbios-example.c
 
 DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
@@ -5019,12 +5057,12 @@ M:      Stuart Hayes <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/driver-api/dcdbas.rst
-F:     drivers/platform/x86/dcdbas.*
+F:     drivers/platform/x86/dell/dcdbas.*
 
 DELL WMI DESCRIPTOR DRIVER
 M:     Mario Limonciello <[email protected]>
 S:     Maintained
-F:     drivers/platform/x86/dell-wmi-descriptor.c
+F:     drivers/platform/x86/dell/dell-wmi-descriptor.c
 
 DELL WMI SYSMAN DRIVER
 M:     Divya Bharathi <[email protected]>
@@ -5033,13 +5071,13 @@ M:      Prasanth Ksr <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-class-firmware-attributes
-F:     drivers/platform/x86/dell-wmi-sysman/
+F:     drivers/platform/x86/dell/dell-wmi-sysman/
 
 DELL WMI NOTIFICATIONS DRIVER
 M:     Matthew Garrett <[email protected]>
 M:     Pali Rohár <[email protected]>
 S:     Maintained
-F:     drivers/platform/x86/dell-wmi.c
+F:     drivers/platform/x86/dell/dell-wmi.c
 
 DELTA ST MEDIA DRIVER
 M:     Hugues Fruchet <[email protected]>
@@ -5281,6 +5319,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
 F:     Documentation/devicetree/bindings/dma/
 F:     Documentation/driver-api/dmaengine/
 F:     drivers/dma/
+F:     include/linux/dma/
 F:     include/linux/dmaengine.h
 F:     include/linux/of_dma.h
 
@@ -5784,6 +5823,7 @@ F:        drivers/gpu/drm/vboxvideo/
 DRM DRIVER FOR VMWARE VIRTUAL GPU
 M:     "VMware Graphics" <[email protected]>
 M:     Roland Scheidegger <[email protected]>
+M:     Zack Rusin <[email protected]>
 L:     [email protected]
 S:     Supported
 T:     git git://people.freedesktop.org/~sroland/linux
@@ -5985,8 +6025,8 @@ F:        Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
 F:     drivers/gpu/drm/stm
 
 DRM DRIVERS FOR TI KEYSTONE
-M:     Jyri Sarha <j[email protected]>
-M:     Tomi Valkeinen <tom[email protected]>
+M:     Jyri Sarha <j[email protected]>
+M:     Tomi Valkeinen <tom[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5996,15 +6036,15 @@ F:      Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
 F:     drivers/gpu/drm/tidss/
 
 DRM DRIVERS FOR TI LCDC
-M:     Jyri Sarha <j[email protected]>
-R:     Tomi Valkeinen <tom[email protected]>
+M:     Jyri Sarha <j[email protected]>
+R:     Tomi Valkeinen <tom[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/display/tilcdc/
 F:     drivers/gpu/drm/tilcdc/
 
 DRM DRIVERS FOR TI OMAP
-M:     Tomi Valkeinen <tom[email protected]>
+M:     Tomi Valkeinen <tom[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/display/ti/
@@ -6057,14 +6097,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/xlnx/
 F:     drivers/gpu/drm/xlnx/
 
-DRM DRIVERS FOR ZTE ZX
-M:     Shawn Guo <[email protected]>
-L:     [email protected]
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     Documentation/devicetree/bindings/display/zte,vou.txt
-F:     drivers/gpu/drm/zte/
-
 DRM PANEL DRIVERS
 M:     Thierry Reding <[email protected]>
 R:     Sam Ravnborg <[email protected]>
@@ -6224,7 +6256,7 @@ F:        include/linux/dim.h
 F:     lib/dim/
 
 DZ DECSTATION DZ11 SERIAL DRIVER
-M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 S:     Maintained
 F:     drivers/tty/serial/dz.*
 
@@ -6474,9 +6506,9 @@ S:        Maintained
 F:     drivers/edac/skx_*.[ch]
 
 EDAC-TI
-M:     Tero Kristo <[email protected]>
+M:     Tero Kristo <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/edac/ti_edac.c
 
 EDIROL UA-101/UA-1000 DRIVER
@@ -6863,6 +6895,9 @@ F:        include/linux/fs.h
 F:     include/linux/fs_types.h
 F:     include/uapi/linux/fs.h
 F:     include/uapi/linux/openat2.h
+X:     fs/io-wq.c
+X:     fs/io-wq.h
+X:     fs/io_uring.c
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:     Riku Voipio <[email protected]>
@@ -6954,9 +6989,10 @@ M:       Wu Hao <[email protected]>
 R:     Tom Rix <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     Documentation/ABI/testing/sysfs-bus-dfl
+F:     Documentation/ABI/testing/sysfs-bus-dfl*
 F:     Documentation/fpga/dfl.rst
 F:     drivers/fpga/dfl*
+F:     include/linux/dfl.h
 F:     include/uapi/linux/fpga-dfl.h
 
 FPGA MANAGER FRAMEWORK
@@ -7377,13 +7413,6 @@ M:       Kieran Bingham <[email protected]>
 S:     Supported
 F:     scripts/gdb/
 
-GDT SCSI DISK ARRAY CONTROLLER DRIVER
-M:     Achim Leubner <[email protected]>
-L:     [email protected]
-S:     Supported
-W:     http://www.icp-vortex.com/
-F:     drivers/scsi/gdt*
-
 GEMTEK FM RADIO RECEIVER DRIVER
 M:     Hans Verkuil <[email protected]>
 L:     [email protected]
@@ -7929,6 +7958,12 @@ F:       drivers/hid/
 F:     include/linux/hid*
 F:     include/uapi/linux/hid*
 
+HID PLAYSTATION DRIVER
+M:     Roderick Colenbrander <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     drivers/hid/hid-playstation.c
+
 HID SENSOR HUB DRIVERS
 M:     Jiri Kosina <[email protected]>
 M:     Jonathan Cameron <[email protected]>
@@ -8160,7 +8195,7 @@ F:        net/hsr/
 HT16K33 LED CONTROLLER DRIVER
 M:     Robin van der Gracht <[email protected]>
 S:     Maintained
-F:     Documentation/devicetree/bindings/display/ht16k33.txt
+F:     Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
 F:     drivers/auxdisplay/ht16k33.c
 
 HTCPEN TOUCHSCREEN DRIVER
@@ -8434,11 +8469,8 @@ F:       drivers/i3c/
 F:     include/linux/i3c/
 
 IA64 (Itanium) PLATFORM
-M:     Tony Luck <[email protected]>
-M:     Fenghua Yu <[email protected]>
 L:     [email protected]
-S:     Odd Fixes
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
+S:     Orphan
 F:     Documentation/ia64/
 F:     arch/ia64/
 
@@ -8881,7 +8913,6 @@ F:        drivers/mfd/intel_pmc_bxt.c
 F:     include/linux/mfd/intel_pmc_bxt.h
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
-M:     Intel SCU Linux support <[email protected]>
 M:     Artur Paszkiewicz <[email protected]>
 L:     [email protected]
 S:     Supported
@@ -8939,7 +8970,6 @@ L:        [email protected]
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:     drivers/gpio/gpio-ich.c
-F:     drivers/gpio/gpio-intel-mid.c
 F:     drivers/gpio/gpio-merrifield.c
 F:     drivers/gpio/gpio-ml-ioh.c
 F:     drivers/gpio/gpio-pch.c
@@ -9012,9 +9042,11 @@ INTEL IPU3 CSI-2 CIO2 DRIVER
 M:     Yong Zhi <[email protected]>
 M:     Sakari Ailus <[email protected]>
 M:     Bingbu Cao <[email protected]>
+M:     Dan Scally <[email protected]>
 R:     Tianshu Qiu <[email protected]>
 L:     [email protected]
 S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
 F:     drivers/media/pci/intel/ipu3/
 
@@ -9061,6 +9093,17 @@ F:       drivers/crypto/keembay/keembay-ocs-aes-core.c
 F:     drivers/crypto/keembay/ocs-aes.c
 F:     drivers/crypto/keembay/ocs-aes.h
 
+INTEL KEEM BAY OCS HCU CRYPTO DRIVER
+M:     Daniele Alessandrelli <[email protected]>
+M:     Declan Murphy <[email protected]>
+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
+
 INTEL MANAGEMENT ENGINE (mei)
 M:     Tomas Winkler <[email protected]>
 L:     [email protected]
@@ -9098,14 +9141,11 @@ M:      Andy Shevchenko <[email protected]>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:     drivers/gpio/gpio-*cove.c
-F:     drivers/gpio/gpio-msic.c
 
 INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
 M:     Andy Shevchenko <[email protected]>
 S:     Maintained
-F:     drivers/mfd/intel_msic.c
 F:     drivers/mfd/intel_soc_pmic*
-F:     include/linux/mfd/intel_msic.h
 F:     include/linux/mfd/intel_soc_pmic*
 
 INTEL PMT DRIVER
@@ -9227,10 +9267,11 @@ F:      include/linux/tboot.h
 
 INTEL SGX
 M:     Jarkko Sakkinen <[email protected]>
+R:     Dave Hansen <[email protected]>
 L:     [email protected]
 S:     Supported
 Q:     https://patchwork.kernel.org/project/intel-sgx/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
 F:     Documentation/x86/sgx.rst
 F:     arch/x86/entry/vdso/vsgx.S
 F:     arch/x86/include/uapi/asm/sgx.h
@@ -9298,6 +9339,7 @@ F:        include/uapi/linux/iommu.h
 
 IO_URING
 M:     Jens Axboe <[email protected]>
+R:     Pavel Begunkov <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://git.kernel.dk/linux-block
@@ -9305,6 +9347,7 @@ T:        git git://git.kernel.dk/liburing
 F:     fs/io-wq.c
 F:     fs/io-wq.h
 F:     fs/io_uring.c
+F:     include/linux/io_uring.h
 F:     include/uapi/linux/io_uring.h
 
 IPMI SUBSYSTEM
@@ -9326,7 +9369,6 @@ W:        http://www.adaptec.com/
 F:     drivers/scsi/ips*
 
 IPVS
-M:     Wensong Zhang <[email protected]>
 M:     Simon Horman <[email protected]>
 M:     Julian Anastasov <[email protected]>
 L:     [email protected]
@@ -9563,16 +9605,18 @@ F:      Documentation/hwmon/k8temp.rst
 F:     drivers/hwmon/k8temp.c
 
 KASAN
-M:     Andrey Ryabinin <aryabinin@virtuozzo.com>
+M:     Andrey Ryabinin <ryabinin.a.a@gmail.com>
 R:     Alexander Potapenko <[email protected]>
+R:     Andrey Konovalov <[email protected]>
 R:     Dmitry Vyukov <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/dev-tools/kasan.rst
-F:     arch/*/include/asm/kasan.h
+F:     arch/*/include/asm/*kasan.h
 F:     arch/*/mm/kasan_init*
 F:     include/linux/kasan*.h
-F:     lib/test_kasan.c
+F:     lib/Kconfig.kasan
+F:     lib/test_kasan*.c
 F:     mm/kasan/
 F:     scripts/Makefile.kasan
 
@@ -9587,7 +9631,7 @@ F:        scripts/kconfig/
 
 KCOV
 R:     Dmitry Vyukov <[email protected]>
-R:     Andrey Konovalov <andreyknvl@google.com>
+R:     Andrey Konovalov <andreyknvl@gmail.com>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/dev-tools/kcov.rst
@@ -9738,6 +9782,7 @@ M:        Aleksandar Markovic <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 F:     arch/mips/include/asm/kvm*
 F:     arch/mips/include/uapi/asm/kvm*
 F:     arch/mips/kvm/
@@ -9847,6 +9892,18 @@ F:       include/linux/keyctl.h
 F:     include/uapi/linux/keyctl.h
 F:     security/keys/
 
+KFENCE
+M:     Alexander Potapenko <[email protected]>
+M:     Marco Elver <[email protected]>
+R:     Dmitry Vyukov <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/dev-tools/kfence.rst
+F:     arch/*/include/asm/kfence.h
+F:     include/linux/kfence.h
+F:     lib/Kconfig.kfence
+F:     mm/kfence/
+
 KFIFO
 M:     Stefani Seibold <[email protected]>
 S:     Maintained
@@ -9907,7 +9964,7 @@ F:        include/linux/kprobes.h
 F:     kernel/kprobes.c
 
 KS0108 LCD CONTROLLER DRIVER
-M:     Miguel Ojeda Sandonis <[email protected]>
+M:     Miguel Ojeda <[email protected]>
 S:     Maintained
 F:     Documentation/admin-guide/auxdisplay/ks0108.rst
 F:     drivers/auxdisplay/ks0108.c
@@ -10371,6 +10428,8 @@ LOCKING PRIMITIVES
 M:     Peter Zijlstra <[email protected]>
 M:     Ingo Molnar <[email protected]>
 M:     Will Deacon <[email protected]>
+R:     Waiman Long <[email protected]>
+R:     Boqun Feng <[email protected]> (LOCKDEP)
 L:     [email protected]
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@ -10691,6 +10750,8 @@ M:      Sunil Goutham <[email protected]>
 M:     Linu Cherian <[email protected]>
 M:     Geetha sowjanya <[email protected]>
 M:     Jerin Jacob <[email protected]>
+M:     hariprasad <[email protected]>
+M:     Subbaraya Sundeep <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
@@ -11180,6 +11241,15 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
 F:     drivers/i2c/busses/i2c-mt65xx.c
 
+MEDIATEK IOMMU DRIVER
+M:     Yong Wu <[email protected]>
+L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
+S:     Supported
+F:     Documentation/devicetree/bindings/iommu/mediatek*
+F:     drivers/iommu/mtk_iommu*
+F:     include/dt-bindings/memory/mt*-port.h
+
 MEDIATEK JPEG DRIVER
 M:     Rick Chang <[email protected]>
 M:     Bin Liu <[email protected]>
@@ -11269,6 +11339,8 @@ L:      [email protected]
 L:     [email protected] (moderated for non-subscribers)
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/usb/mediatek,*
+F:     drivers/usb/host/xhci-mtk*
 F:     drivers/usb/mtu3/
 
 MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
@@ -11550,7 +11622,7 @@ L:      [email protected]
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
-F:     drivers/media/meson/ge2d/
+F:     drivers/media/platform/meson/ge2d/
 
 MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 M:     Liang Yang <[email protected]>
@@ -11602,7 +11674,6 @@ F:      drivers/dma/at_hdmac.c
 F:     drivers/dma/at_hdmac_regs.h
 F:     drivers/dma/at_xdmac.c
 F:     include/dt-bindings/dma/at91.h
-F:     include/linux/platform_data/dma-atmel.h
 
 MICROCHIP AT91 SERIAL DRIVER
 M:     Richard Genoud <[email protected]>
@@ -11688,9 +11759,9 @@ F:      drivers/video/fbdev/atmel_lcdfb.c
 F:     include/video/atmel_lcdc.h
 
 MICROCHIP MCP16502 PMIC DRIVER
-M:     Andrei Stefanescu <andrei.stefanescu@microchip.com>
+M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     [email protected] (moderated for non-subscribers)
-S:     Maintained
+S:     Supported
 F:     Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
 F:     drivers/regulator/mcp16502.c
 
@@ -11805,12 +11876,31 @@ S:    Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 F:     drivers/platform/surface/
 
+MICROSOFT SURFACE HOT-PLUG DRIVER
+M:     Maximilian Luz <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/platform/surface/surface_hotplug.c
+
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:     Chen Yu <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/platform/surface/surfacepro3_button.c
 
+MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
+M:     Maximilian Luz <[email protected]>
+S:     Maintained
+W:     https://github.com/linux-surface/surface-aggregator-module
+C:     irc://chat.freenode.net/##linux-surface
+F:     Documentation/driver-api/surface_aggregator/
+F:     drivers/platform/surface/aggregator/
+F:     drivers/platform/surface/surface_acpi_notify.c
+F:     drivers/platform/surface/surface_aggregator_cdev.c
+F:     include/linux/surface_acpi_notify.h
+F:     include/linux/surface_aggregator/
+F:     include/uapi/linux/surface_aggregator/
+
 MICROTEK X6 SCANNER
 M:     Oliver Neukum <[email protected]>
 S:     Maintained
@@ -11833,9 +11923,11 @@ L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
 F:     Documentation/driver-api/media/drivers/ccs/
+F:     Documentation/userspace-api/media/drivers/ccs.rst
 F:     drivers/media/i2c/ccs-pll.c
 F:     drivers/media/i2c/ccs-pll.h
 F:     drivers/media/i2c/ccs/
+F:     include/uapi/linux/ccs.h
 F:     include/uapi/linux/smiapp.h
 
 MIPS
@@ -11901,8 +11993,7 @@ L:      [email protected]
 S:     Maintained
 F:     arch/mips/include/asm/mach-loongson2ef/
 F:     arch/mips/loongson2ef/
-F:     drivers/*/*/*loongson2*
-F:     drivers/*/*loongson2*
+F:     drivers/cpufreq/loongson2_cpufreq.c
 
 MIPS/LOONGSON64 ARCHITECTURE
 M:     Huacai Chen <[email protected]>
@@ -11911,8 +12002,6 @@ L:      [email protected]
 S:     Maintained
 F:     arch/mips/include/asm/mach-loongson64/
 F:     arch/mips/loongson64/
-F:     drivers/*/*/*loongson3*
-F:     drivers/*/*loongson3*
 F:     drivers/irqchip/irq-loongson*
 F:     drivers/platform/mips/cpu_hwmon.c
 
@@ -12416,8 +12505,8 @@ F:      tools/testing/selftests/net/ipsec.c
 
 NETWORKING [IPv4/IPv6]
 M:     "David S. Miller" <[email protected]>
-M:     Alexey Kuznetsov <[email protected]>
 M:     Hideaki YOSHIFUJI <[email protected]>
+M:     David Ahern <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@ -12473,7 +12562,6 @@ F:      net/ipv6/tcp*.c
 
 NETWORKING [TLS]
 M:     Boris Pismenny <[email protected]>
-M:     Aviad Yehezkel <[email protected]>
 M:     John Fastabend <[email protected]>
 M:     Daniel Borkmann <[email protected]>
 M:     Jakub Kicinski <[email protected]>
@@ -12522,6 +12610,14 @@ F:     include/net/nfc/
 F:     include/uapi/linux/nfc.h
 F:     net/nfc/
 
+NFC VIRTUAL NCI DEVICE DRIVER
+M:     Bongsu Jeon <[email protected]>
+L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
+S:     Supported
+F:     drivers/nfc/virtual_ncidev.c
+F:     tools/testing/selftests/nci/
+
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:     Trond Myklebust <[email protected]>
 M:     Anna Schumaker <[email protected]>
@@ -12749,6 +12845,13 @@ F:     drivers/iio/gyro/fxas21002c_core.c
 F:     drivers/iio/gyro/fxas21002c_i2c.c
 F:     drivers/iio/gyro/fxas21002c_spi.c
 
+NXP i.MX CLOCK DRIVERS
+M:     Abel Vesa <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     drivers/clk/imx/
+
 NXP i.MX 8MQ DCSS DRIVER
 M:     Laurentiu Palcu <[email protected]>
 R:     Lucas Stach <[email protected]>
@@ -12833,6 +12936,7 @@ F:      drivers/net/dsa/ocelot/*
 F:     drivers/net/ethernet/mscc/
 F:     include/soc/mscc/ocelot*
 F:     net/dsa/tag_ocelot.c
+F:     net/dsa/tag_ocelot_8021q.c
 F:     tools/testing/selftests/drivers/net/ocelot/*
 
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
@@ -12848,7 +12952,7 @@ F:      include/misc/ocxl*
 F:     include/uapi/misc/ocxl.h
 
 OMAP AUDIO SUPPORT
-M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
+M:     Peter Ujfalusi <peter.ujfalusi@gmail.com>
 M:     Jarkko Nikula <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 L:     [email protected]
@@ -12892,7 +12996,7 @@ S:      Orphan
 F:     drivers/video/fbdev/omap/
 
 OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
-M:     Roger Quadros <rogerq@ti.com>
+M:     Roger Quadros <rogerq@kernel.org>
 M:     Tony Lindgren <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -13112,7 +13216,7 @@ M:      Jacopo Mondi <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/ov5647.yaml
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
 F:     drivers/media/i2c/ov5647.c
 
 OMNIVISION OV5670 SENSOR DRIVER
@@ -13311,15 +13415,6 @@ S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 F:     sound/drivers/opl4/
 
-OPROFILE
-M:     Robert Richter <[email protected]>
-L:     [email protected]
-S:     Maintained
-F:     arch/*/include/asm/oprofile*.h
-F:     arch/*/oprofile/
-F:     drivers/oprofile/
-F:     include/linux/oprofile.h
-
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 M:     Mark Fasheh <[email protected]>
 M:     Joel Becker <[email protected]>
@@ -13989,15 +14084,6 @@ L:     [email protected]
 S:     Maintained
 F:     drivers/hid/hid-picolcd*
 
-PICOXCELL SUPPORT
-M:     Jamie Iles <[email protected]>
-L:     [email protected] (moderated for non-subscribers)
-S:     Supported
-T:     git git://github.com/jamieiles/linux-2.6-ji.git
-F:     arch/arm/boot/dts/picoxcell*
-F:     arch/arm/mach-picoxcell/
-F:     drivers/crypto/picoxcell*
-
 PIDFD API
 M:     Christian Brauner <[email protected]>
 L:     [email protected]
@@ -14104,7 +14190,6 @@ L:      [email protected]
 S:     Odd Fixes
 F:     arch/mips/boot/dts/img/pistachio*
 F:     arch/mips/configs/pistachio*_defconfig
-F:     arch/mips/include/asm/mach-pistachio/
 F:     arch/mips/pistachio/
 
 PKTCDVD DRIVER
@@ -14517,10 +14602,18 @@ S:    Supported
 F:     drivers/crypto/qat/
 
 QCOM AUDIO (ASoC) DRIVERS
-M:     Patrick Lai <plai@codeaurora.org>
+M:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 M:     Banajit Goswami <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Supported
+F:     sound/soc/codecs/lpass-va-macro.c
+F:     sound/soc/codecs/lpass-wsa-macro.*
+F:     sound/soc/codecs/msm8916-wcd-analog.c
+F:     sound/soc/codecs/msm8916-wcd-digital.c
+F:     sound/soc/codecs/wcd9335.*
+F:     sound/soc/codecs/wcd934x.c
+F:     sound/soc/codecs/wcd-clsh-v2.*
+F:     sound/soc/codecs/wsa881x.c
 F:     sound/soc/qcom/
 
 QCOM IPA DRIVER
@@ -14619,6 +14712,12 @@ L:     [email protected]
 S:     Supported
 F:     drivers/staging/qlge/
 
+QLOGIC QLGE 10Gb ETHERNET DRIVER
+M:     Coiby Xu <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/networking/device_drivers/qlogic/qlge.rst
+
 QM1D1B0004 MEDIA DRIVER
 M:     Akihiro Tsukada <[email protected]>
 L:     [email protected]
@@ -14644,9 +14743,11 @@ M:     Stuart Yoder <[email protected]>
 M:     Laurentiu Tudor <[email protected]>
 L:     [email protected]
 S:     Maintained
+F:     Documentation/ABI/stable/sysfs-bus-fsl-mc
 F:     Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
 F:     Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst
 F:     drivers/bus/fsl-mc/
+F:     include/uapi/linux/fsl_mc.h
 
 QT1010 MEDIA DRIVER
 M:     Antti Palosaari <[email protected]>
@@ -14825,7 +14926,7 @@ M:      Alex Deucher <[email protected]>
 M:     Christian König <[email protected]>
 L:     [email protected]
 S:     Supported
-T:     git git://people.freedesktop.org/~agd5f/linux
+T:     git https://gitlab.freedesktop.org/agd5f/linux.git
 F:     drivers/gpu/drm/amd/
 F:     drivers/gpu/drm/radeon/
 F:     include/uapi/drm/amdgpu_drm.h
@@ -14970,6 +15071,18 @@ F:     drivers/media/i2c/max9271.c
 F:     drivers/media/i2c/max9271.h
 F:     drivers/media/i2c/rdacm20.c
 
+RDACM21 Camera Sensor
+M:     Jacopo Mondi <[email protected]>
+M:     Kieran Bingham <[email protected]>
+M:     Laurent Pinchart <[email protected]>
+M:     Niklas Söderlund <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/i2c/rdacm2x-gmsl.yaml
+F:     drivers/media/i2c/max9271.c
+F:     drivers/media/i2c/max9271.h
+F:     drivers/media/i2c/rdacm21.c
+
 RDC R-321X SoC
 M:     Florian Fainelli <[email protected]>
 S:     Maintained
@@ -15694,7 +15807,6 @@ F:      drivers/media/i2c/s5k5baf.c
 SAMSUNG S5P Security SubSystem (SSS) DRIVER
 M:     Krzysztof Kozlowski <[email protected]>
 M:     Vladimir Zapolskiy <[email protected]>
-M:     Kamil Konieczny <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
@@ -16242,12 +16354,13 @@ S:    Maintained
 F:     Documentation/fb/sm712fb.rst
 F:     drivers/video/fbdev/sm712*
 
-SIMPLE FIRMWARE INTERFACE (SFI)
-S:     Obsolete
-W:     http://simplefirmware.org/
-F:     arch/x86/platform/sfi/
-F:     drivers/sfi/
-F:     include/linux/sfi*.h
+SILVACO I3C DUAL-ROLE MASTER
+M:     Miquel Raynal <[email protected]>
+M:     Conor Culhane <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
+F:     drivers/i3c/master/svc-i3c-master.c
 
 SIMPLEFB FB DRIVER
 M:     Hans de Goede <[email protected]>
@@ -16326,6 +16439,7 @@ M:      Pekka Enberg <[email protected]>
 M:     David Rientjes <[email protected]>
 M:     Joonsoo Kim <[email protected]>
 M:     Andrew Morton <[email protected]>
+M:     Vlastimil Babka <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     include/linux/sl?b*.h
@@ -16545,6 +16659,7 @@ M:      Sakari Ailus <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/imx258.yaml
 F:     drivers/media/i2c/imx258.c
 
 SONY IMX274 SENSOR DRIVER
@@ -16570,6 +16685,15 @@ S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/imx319.c
 
+SONY IMX334 SENSOR DRIVER
+M:     Paul J. Murphy <[email protected]>
+M:     Daniele Alessandrelli <[email protected]>
+L:     [email protected]
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
+F:     drivers/media/i2c/imx334.c
+
 SONY IMX355 SENSOR DRIVER
 M:     Tianshu Qiu <[email protected]>
 L:     [email protected]
@@ -16659,6 +16783,7 @@ R:      Pierre-Louis Bossart <[email protected]>
 R:     Sanyog Kale <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
 F:     Documentation/driver-api/soundwire/
 F:     drivers/soundwire/
 F:     include/linux/soundwire/
@@ -16940,12 +17065,6 @@ F:     include/linux/static_call*.h
 F:     kernel/jump_label.c
 F:     kernel/static_call.c
 
-STEC S1220 SKD DRIVER
-M:     Damien Le Moal <[email protected]>
-L:     [email protected]
-S:     Maintained
-F:     drivers/block/skd*[ch]
-
 STI AUDIO (ASoC) DRIVERS
 M:     Arnaud Pouliquen <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -16971,7 +17090,7 @@ M:      Olivier Moysan <[email protected]>
 M:     Arnaud Pouliquen <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/sound/st,stm32-*.txt
+F:     Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
 F:     sound/soc/stm/
 
 STM32 TIMER/LPTIMER DRIVERS
@@ -17215,6 +17334,7 @@ F:      drivers/mfd/syscon.c
 
 SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
 M:     Sudeep Holla <[email protected]>
+R:     Cristian Marussi <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
@@ -17222,6 +17342,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/regulator/scmi-regulator.c
 F:     drivers/reset/reset-scmi.c
 F:     include/linux/sc[mp]i_protocol.h
 F:     include/trace/events/scmi.h
@@ -17505,6 +17626,14 @@ M:     Laxman Dewangan <[email protected]>
 S:     Supported
 F:     drivers/spi/spi-tegra*
 
+TEGRA QUAD SPI DRIVER
+M:     Thierry Reding <[email protected]>
+M:     Jonathan Hunter <[email protected]>
+M:     Sowjanya Komatineni <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/spi/spi-tegra210-quad.c
+
 TEGRA VIDEO DRIVER
 M:     Thierry Reding <[email protected]>
 M:     Jonathan Hunter <[email protected]>
@@ -17548,7 +17677,7 @@ F:      arch/xtensa/
 F:     drivers/irqchip/irq-xtensa-*
 
 TEXAS INSTRUMENTS ASoC DRIVERS
-M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
+M:     Peter Ujfalusi <peter.ujfalusi@gmail.com>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/ti/
@@ -17575,7 +17704,7 @@ F:      include/linux/dma/k3-psil.h
 
 TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
 M:     Nishanth Menon <[email protected]>
-M:     Tero Kristo <[email protected]>
+M:     Tero Kristo <[email protected]>
 M:     Santosh Shilimkar <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -17597,6 +17726,15 @@ F:     include/dt-bindings/soc/ti,sci_pm_domain.h
 F:     include/linux/soc/ti/ti_sci_inta_msi.h
 F:     include/linux/soc/ti/ti_sci_protocol.h
 
+TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
+M:     Robert Marko <[email protected]>
+M:     Luka Perkov <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
+F:     Documentation/hwmon/tps23861.rst
+F:     drivers/hwmon/tps23861.c
+
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:     Hans Verkuil <[email protected]>
 L:     [email protected]
@@ -17650,7 +17788,7 @@ F:      drivers/thermal/gov_power_allocator.c
 F:     include/trace/events/thermal_power_allocator.h
 
 THINKPAD ACPI EXTRAS DRIVER
-M:     Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
+M:     Henrique de Moraes Holschuh <hmh@hmh.eng.br>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
@@ -17719,9 +17857,9 @@ S:      Maintained
 F:     drivers/clk/clk-cdce706.c
 
 TI CLOCK DRIVER
-M:     Tero Kristo <[email protected]>
+M:     Tero Kristo <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/clk/ti/
 F:     include/linux/clk/ti.h
 
@@ -17847,7 +17985,7 @@ M:      Dan Murphy <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/can/tcan4x5x.txt
-F:     drivers/net/can/m_can/tcan4x5x.c
+F:     drivers/net/can/m_can/tcan4x5x*
 
 TI TRF7970A NFC DRIVER
 M:     Mark Greer <[email protected]>
@@ -17858,7 +17996,7 @@ F:      Documentation/devicetree/bindings/net/nfc/trf7970a.txt
 F:     drivers/nfc/trf7970a.c
 
 TI TWL4030 SERIES SOC CODEC DRIVER
-M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
+M:     Peter Ujfalusi <peter.ujfalusi@gmail.com>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/twl4030*
@@ -18111,7 +18249,7 @@ F:      Documentation/networking/tuntap.rst
 F:     arch/um/os-Linux/drivers/
 
 TURBOCHANNEL SUBSYSTEM
-M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 M:     Ralf Baechle <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -18424,7 +18562,7 @@ F:      Documentation/usb/ohci.rst
 F:     drivers/usb/host/ohci*
 
 USB OTG FSM (Finite State Machine)
-M:     Peter Chen <[email protected]>
+M:     Peter Chen <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
@@ -19078,7 +19216,6 @@ K:      regulator_get_optional
 
 VRF
 M:     David Ahern <[email protected]>
-M:     Shrijeet Mukherjee <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/networking/vrf.rst
@@ -19429,7 +19566,7 @@ F:      drivers/net/ethernet/*/*/*xdp*
 K:     (?:\b|_)xdp(?:\b|_)
 
 XDP SOCKETS (AF_XDP)
-M:     Björn Töpel <bjorn[email protected]>
+M:     Björn Töpel <bjorn@kernel.org>
 M:     Magnus Karlsson <[email protected]>
 R:     Jonathan Lemon <[email protected]>
 L:     [email protected]
@@ -19745,7 +19882,7 @@ F:      Documentation/admin-guide/blockdev/zram.rst
 F:     drivers/block/zram/
 
 ZS DECSTATION Z85C30 SERIAL DRIVER
-M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 S:     Maintained
 F:     drivers/tty/serial/zs.*