Merge tag 'mtd/for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

Pull MTD updates from Miquel Raynal:
 "MTD changes:

   - parsers: ofpart: add workaround for #size-cells 0

   - dt-bindings: partitions: Fix partition node name pattern

   - dataflash: remove duplicate SPI ID table

  Raw NAND core changes:

   - Check the data only read pattern only once

   - Prepare the late addition of supported operation checks

   - Support for sequential cache reads

   - Fix nand_chip kdoc

  Raw NAND driver changes:

   - Fsl_elbc: Propagate HW ECC settings to HW

   - Marvell: Add missing layouts

   - Pasemi: Don't use static data to track per-device state

   - Sunxi:
      - Fix the size of the last OOB region
      - Remove an unnecessary check
      - Remove an unnecessary check
      - Clean up chips after failed init
      - Precompute the ECC_CTL register value
      - Embed sunxi_nand_hw_ecc by value
      - Update OOB layout to match hardware

   - tmio_nand: Remove driver

   - vf610_nfc: Use regular comments for functions

  SPI-NAND driver changes:

   - Add support for AllianceMemory AS5F34G04SND

   - Macronix: use scratch buffer for DMA operation

  NAND ECC changes:

   - Mediatek:
      - Add ECC support fot MT7986 IC
      - Add compatible for MT7986
      - dt-bindings: Split ECC engine with rawnand controller

  SPI NOR changes:

   - Misc core fixes

  SPI NOR driver changes:

   - Spansion: Minor fixes"

* tag 'mtd/for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (33 commits)
  mtd: parsers: ofpart: add workaround for #size-cells 0
  mtd: rawnand: sunxi: Precompute the ECC_CTL register value
  mtd: rawnand: sunxi: Embed sunxi_nand_hw_ecc by value
  mtd: rawnand: sunxi: Update OOB layout to match hardware
  mtd: spi-nor: Sort headers alphabetically
  mtd: spi-nor: Fix shift-out-of-bounds in spi_nor_set_erase_type
  mtd: nand: ecc-mtk: Add ECC support fot MT7986 IC
  dt-bindings: mtd: mediatek,nand-ecc-engine: Add compatible for MT7986
  dt-bindings: mtd: Split ECC engine with rawnand controller
  mtd: rawnand: fsl_elbc: Propagate HW ECC settings to HW
  mtd: spinand: Add support for AllianceMemory AS5F34G04SND
  dt-bindings: mtd: partitions: Fix partition node name pattern
  mtd: spi-nor: Create macros to define chip IDs and geometries
  mtd: spi-nor: spansion: Make CFRx reg fields generic
  mtd: spi-nor: spansion: Consider reserved bits in CFR5 register
  mtd: spi-nor: core: fix implicit declaration warning
  mtd: spinand: macronix: use scratch buffer for DMA operation
  mtd: rawnand: Fix nand_chip kdoc
  mtd: rawnand: vf610_nfc: use regular comments for functions
  mtd: rawnand: Support for sequential cache reads
  ...

diff --combined MAINTAINERS
index 84bd678b8af97d9a46ec0ff0dad2ec0b21df7617,d0d29cc379d99af34d3436db4647129f71977930..28522a08b94baed089de5ee0c0eefc8df2fba5de
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -361,8 -361,6 +361,8 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/ABI/testing/configfs-acpi
  F:    Documentation/ABI/testing/sysfs-bus-acpi
  F:    Documentation/firmware-guide/acpi/
 +F:    arch/x86/kernel/acpi/
 +F:    arch/x86/pci/acpi.c
  F:    drivers/acpi/
  F:    drivers/pci/*/*acpi*
  F:    drivers/pci/*acpi*
@@@ -385,7 -383,7 +385,7 @@@ ACPI COMPONENT ARCHITECTURE (ACPICA
  M:    Robert Moore <[email protected]>
  M:    "Rafael J. Wysocki" <[email protected]>
  L:    [email protected]
 -L:    devel@acpica.org
 +L:    [email protected].org
  S:    Supported
  W:    https://acpica.org/
  W:    https://github.com/acpica/acpica/
@@@ -1099,12 -1097,14 +1099,12 @@@ S:   Maintaine
  F:    drivers/dma/ptdma/
  
  AMD SEATTLE DEVICE TREE SUPPORT
 -M:    Brijesh Singh <[email protected]>
  M:    Suravee Suthikulpanit <[email protected]>
  M:    Tom Lendacky <[email protected]>
  S:    Supported
  F:    arch/arm64/boot/dts/amd/
  
  AMD XGBE DRIVER
 -M:    Tom Lendacky <[email protected]>
  M:    "Shyam Sundar S K" <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -1853,6 -1853,21 +1853,6 @@@ F:     include/dt-bindings/reset/actions,
  F:    include/linux/soc/actions/
  N:    owl
  
 -ARM/ADS SPHERE MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
 -ARM/AFEB9260 MACHINE SUPPORT
 -M:    Sergey Lapin <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
 -ARM/AJECO 1ARM MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/Allwinner SoC Clock Support
  M:    Emilio López <[email protected]>
  S:    Maintained
@@@ -1873,7 -1888,7 +1873,7 @@@ F:      drivers/pinctrl/sunxi
  F:    drivers/soc/sunxi/
  N:    allwinner
  N:    sun[x456789]i
 -N:    sun50i
 +N:    sun[25]0i
  
  ARM/Amlogic Meson SoC CLOCK FRAMEWORK
  M:    Neil Armstrong <[email protected]>
@@@ -2043,6 -2058,11 +2043,6 @@@ F:     arch/arm/boot/dts/ecx-*.dts
  F:    arch/arm/boot/dts/highbank.dts
  F:    arch/arm/mach-highbank/
  
 -ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    arch/arm/mach-cns3xxx/
 -
  ARM/CAVIUM THUNDER NETWORK DRIVER
  M:    Sunil Goutham <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2071,10 -2091,8 +2071,10 @@@ M:    Hartley Sweeten <hsweeten@visionengr
  M:    Alexander Sverdlin <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml
 +F:    arch/arm/boot/compressed/misc-ep93xx.h
  F:    arch/arm/mach-ep93xx/
 -F:    arch/arm/mach-ep93xx/include/mach/
 +F:    drivers/iio/adc/ep93xx_adc.c
  
  ARM/CLKDEV SUPPORT
  M:    Russell King <[email protected]>
@@@ -2090,6 -2108,11 +2090,6 @@@ S:     Maintaine
  F:    arch/arm/boot/dts/cx92755*
  N:    digicolor
  
 -ARM/CONTEC MICRO9 MACHINE SUPPORT
 -M:    Hubert Feurstein <[email protected]>
 -S:    Maintained
 -F:    arch/arm/mach-ep93xx/micro9.c
 -
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
  M:    Mathieu Poirier <[email protected]>
  M:    Suzuki K Poulose <[email protected]>
@@@ -2101,7 -2124,6 +2101,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
  F:    Documentation/devicetree/bindings/arm/arm,coresight-*.yaml
 +F:    Documentation/devicetree/bindings/arm/qcom,coresight-*.yaml
  F:    Documentation/devicetree/bindings/arm/arm,embedded-trace-extension.yaml
  F:    Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml
  F:    Documentation/trace/coresight/*
@@@ -2117,6 -2139,10 +2117,6 @@@ F:     tools/perf/arch/arm/util/pmu.
  F:    tools/perf/util/cs-etm-decoder/*
  F:    tools/perf/util/cs-etm.*
  
 -ARM/CORGI MACHINE SUPPORT
 -M:    Richard Purdie <[email protected]>
 -S:    Maintained
 -
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Hans Ulli Kroll <[email protected]>
  M:    Linus Walleij <[email protected]>
@@@ -2156,6 -2182,12 +2156,6 @@@ F:     include/dt-bindings/bus/moxtet.
  F:    include/linux/armada-37xx-rwtm-mailbox.h
  F:    include/linux/moxtet.h
  
 -ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 -M:    Robert Jarzmik <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/ezx.c
 -
  ARM/FARADAY FA526 PORT
  M:    Hans Ulli Kroll <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2181,9 -2213,6 +2181,9 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  X:    drivers/media/i2c/
 +F:    arch/arm64/boot/dts/freescale/
 +X:    arch/arm64/boot/dts/freescale/fsl-*
 +X:    arch/arm64/boot/dts/freescale/qoriq-*
  N:    imx
  N:    mxs
  
@@@ -2208,11 -2237,25 +2208,11 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    arch/arm/boot/dts/vf*
  F:    arch/arm/mach-imx/*vf610*
  
 -ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/GUMSTIX MACHINE SUPPORT
  M:    Steve Sakoman <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
 -M:    Philipp Zabel <[email protected]>
 -M:    Paul Parsons <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/hx4700.c
 -F:    arch/arm/mach-pxa/include/mach/hx4700.h
 -F:    sound/soc/pxa/hx4700.c
 -
  ARM/HISILICON SOC SUPPORT
  M:    Wei Xu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2237,18 -2280,13 +2237,18 @@@ ARM/HPE GXP ARCHITECTUR
  M:    Jean-Marie Verdun <[email protected]>
  M:    Nick Hawkins <[email protected]>
  S:    Maintained
 +F:    Documentation/hwmon/gxp-fan-ctrl.rst
  F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 +F:    Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml
 +F:    Documentation/devicetree/bindings/i2c/hpe,gxp-i2c.yaml
  F:    Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
  F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
  F:    arch/arm/boot/dts/hpe-bmc*
  F:    arch/arm/boot/dts/hpe-gxp*
  F:    arch/arm/mach-hpe/
  F:    drivers/clocksource/timer-gxp.c
 +F:    drivers/hwmon/gxp-fan-ctrl.c
 +F:    drivers/i2c/busses/i2c-gxp.c
  F:    drivers/spi/spi-gxp.c
  F:    drivers/watchdog/gxp-wdt.c
  
@@@ -2260,6 -2298,27 +2260,6 @@@ L:     [email protected]
  S:    Maintained
  F:    arch/arm/boot/dts/omap3-igep*
  
 -ARM/INCOME PXA270 SUPPORT
 -M:    Marek Vasut <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/colibri-pxa270-income.c
 -
 -ARM/INTEL IOP32X ARM ARCHITECTURE
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
 -ARM/INTEL IQ81342EX MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
 -ARM/INTEL IXDP2850 MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  M:    Imre Kaloz <[email protected]>
@@@ -2267,7 -2326,7 +2267,7 @@@ M:      Krzysztof Halasa <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 -F:    Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.yaml
 +F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
  F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
@@@ -2292,12 -2351,22 +2292,12 @@@ M:   Lennert Buytenhek <kernel@wantstofly
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/LG1K ARCHITECTURE
  M:    Chanho Min <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/lg/
  
 -ARM/LOGICPD PXA270 MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/LPC18XX ARCHITECTURE
  M:    Vladimir Zapolskiy <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2324,6 -2393,10 +2324,6 @@@ F:     drivers/usb/host/ohci-nxp.
  F:    drivers/watchdog/pnx4008_wdt.c
  N:    lpc32xx
  
 -ARM/MAGICIAN MACHINE SUPPORT
 -M:    Philipp Zabel <[email protected]>
 -S:    Maintained
 -
  ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Andrew Lunn <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -2378,14 -2451,11 +2378,14 @@@ F:   drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
 +R:    AngeloGioacchino Del Regno <[email protected]>
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    https://mtk.wiki.kernel.org/
 -C:    irc://chat.freenode.net/linux-mediatek
 +C:    irc://irc.libera.chat/linux-mediatek
 +F:    arch/arm/boot/dts/mt2*
  F:    arch/arm/boot/dts/mt6*
  F:    arch/arm/boot/dts/mt7*
  F:    arch/arm/boot/dts/mt8*
@@@ -2393,7 -2463,7 +2393,7 @@@ F:      arch/arm/mach-mediatek
  F:    arch/arm64/boot/dts/mediatek/
  F:    drivers/soc/mediatek/
  N:    mtk
 -N:    mt[678]
 +N:    mt[2678]
  K:    mediatek
  
  ARM/Mediatek USB3 PHY DRIVER
@@@ -2455,6 -2525,12 +2455,6 @@@ F:     arch/arm/boot/dts/milbeaut
  F:    arch/arm/mach-milbeaut/
  N:    milbeaut
  
 -ARM/MIOA701 MACHINE SUPPORT
 -M:    Robert Jarzmik <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/mioa701.c
 -
  ARM/MStar/Sigmastar Armv7 SoC support
  M:    Daniel Palmer <[email protected]>
  M:    Romain Perier <[email protected]>
@@@ -2475,6 -2551,10 +2475,6 @@@ F:     drivers/watchdog/msc313e_wdt.
  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/Ux500 ARCHITECTURES
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2530,7 -2610,6 +2530,7 @@@ S:      Maintaine
  W:    https://github.com/neuschaefer/wpcm450/wiki
  F:    Documentation/devicetree/bindings/*/*wpcm*
  F:    arch/arm/boot/dts/nuvoton-wpcm450*
 +F:    arch/arm/configs/wpcm450_defconfig
  F:    arch/arm/mach-npcm/wpcm450.c
  F:    drivers/*/*/*wpcm*
  F:    drivers/*/*wpcm*
@@@ -2544,6 -2623,13 +2544,6 @@@ L:     [email protected]
  S:    Maintained
  F:    arch/arm64/boot/dts/freescale/s32g*.dts*
  
 -ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 -L:    [email protected] (subscribers-only)
 -S:    Orphan
 -W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
 -F:    arch/arm/mach-s3c/gta02.h
 -F:    arch/arm/mach-s3c/mach-gta02.c
 -
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2561,6 -2647,43 +2561,6 @@@ F:     arch/arm/mach-oxnas
  F:    drivers/power/reset/oxnas-restart.c
  N:    oxnas
  
 -ARM/PALM TREO SUPPORT
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Orphan
 -F:    arch/arm/mach-pxa/palmtreo.*
 -
 -ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
 -M:    Marek Vasut <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://hackndev.com
 -F:    arch/arm/mach-pxa/include/mach/palmld.h
 -F:    arch/arm/mach-pxa/include/mach/palmtc.h
 -F:    arch/arm/mach-pxa/include/mach/palmtx.h
 -F:    arch/arm/mach-pxa/palmld.c
 -F:    arch/arm/mach-pxa/palmt5.*
 -F:    arch/arm/mach-pxa/palmtc.c
 -F:    arch/arm/mach-pxa/palmte2.*
 -F:    arch/arm/mach-pxa/palmtx.c
 -
 -ARM/PALMZ72 SUPPORT
 -M:    Sergey Lapin <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://hackndev.com
 -F:    arch/arm/mach-pxa/palmz72.*
 -
 -ARM/PLEB SUPPORT
 -M:    Peter Chubb <[email protected]>
 -S:    Maintained
 -W:    http://www.disy.cse.unsw.edu.au/Hardware/PLEB
 -
 -ARM/PT DIGITAL BOARD PORT
 -M:    Stefan Eletzhofer <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://www.armlinux.org.uk/
 -
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
  M:    Bjorn Andersson <[email protected]>
@@@ -2604,6 -2727,11 +2604,6 @@@ F:     include/dt-bindings/*/qcom
  F:    include/linux/*/qcom*
  F:    include/linux/soc/qcom/
  
 -ARM/RADISYS ENP2611 MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/RDA MICRO ARCHITECTURE
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2679,7 -2807,7 +2679,7 @@@ F:      Documentation/devicetree/bindings/i2
  F:    Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
  F:    Documentation/devicetree/bindings/spi/spi-rockchip.yaml
  F:    arch/arm/boot/dts/rk3*
 -F:    arch/arm/boot/dts/rv1108*
 +F:    arch/arm/boot/dts/rv11*
  F:    arch/arm/mach-rockchip/
  F:    drivers/*/*/*rockchip*
  F:    drivers/*/*rockchip*
@@@ -2724,6 -2852,7 +2724,6 @@@ F:      include/linux/platform_data/*s3c
  F:    include/linux/serial_s3c.h
  F:    include/linux/soc/samsung/
  N:    exynos
 -N:    s3c2410
  N:    s3c64xx
  N:    s5pv210
  
@@@ -2796,8 -2925,7 +2796,8 @@@ M:      Patrice Chotard <patrice.chotard@fos
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.stlinux.com
 -F:    Documentation/devicetree/bindings/i2c/i2c-st.txt
 +F:    Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
 +F:    Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml
  F:    arch/arm/boot/dts/sti*
  F:    arch/arm/mach-sti/
  F:    drivers/ata/ahci_st.c
@@@ -2882,7 -3010,7 +2882,7 @@@ M:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    arch/arm64/boot/dts/tesla*
 +F:    arch/arm64/boot/dts/tesla/
  
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <[email protected]>
@@@ -2935,6 -3063,16 +2935,6 @@@ F:     arch/arm64/boot/dts/ti/Makefil
  F:    arch/arm64/boot/dts/ti/k3-*
  F:    include/dt-bindings/pinctrl/k3.h
  
 -ARM/THECUS N2100 MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
 -ARM/TOSA MACHINE SUPPORT
 -M:    Dmitry Eremin-Solenikov <[email protected]>
 -M:    Dirk Opfer <[email protected]>
 -S:    Maintained
 -
  ARM/TOSHIBA VISCONTI ARCHITECTURE
  M:    Nobuhiro Iwamatsu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2965,7 -3103,6 +2965,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
  F:    Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
  F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
@@@ -2992,7 -3129,7 +2992,7 @@@ S:      Maintaine
  F:    */*/*/vexpress*
  F:    */*/vexpress*
  F:    arch/arm/boot/dts/vexpress*
 -F:    arch/arm/mach-vexpress/
 +F:    arch/arm/mach-versatile/
  F:    arch/arm64/boot/dts/arm/
  F:    drivers/clk/versatile/clk-vexpress-osc.c
  F:    drivers/clocksource/timer-versatile.c
@@@ -3005,6 -3142,13 +3005,6 @@@ S:     Maintaine
  W:    http://www.armlinux.org.uk/
  F:    arch/arm/vfp/
  
 -ARM/VOIPAC PXA270 SUPPORT
 -M:    Marek Vasut <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/vpac270.h
 -F:    arch/arm/mach-pxa/vpac270.c
 -
  ARM/VT8500 ARM ARCHITECTURE
  L:    [email protected] (moderated for non-subscribers)
  S:    Orphan
@@@ -3022,6 -3166,13 +3022,6 @@@ F:     drivers/video/fbdev/vt8500lcdfb.
  F:    drivers/video/fbdev/wm8505fb*
  F:    drivers/video/fbdev/wmt_ge_rops.*
  
 -ARM/ZIPIT Z2 SUPPORT
 -M:    Marek Vasut <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/z2.h
 -F:    arch/arm/mach-pxa/z2.c
 -
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3159,7 -3310,7 +3159,7 @@@ ASPEED CRYPTO DRIVE
  M:    Neal Liu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml
 +F:    Documentation/devicetree/bindings/crypto/aspeed,*
  F:    drivers/crypto/aspeed/
  
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
@@@ -3360,7 -3511,7 +3360,7 @@@ F:      drivers/net/ieee802154/atusb.
  AUDIT SUBSYSTEM
  M:    Paul Moore <[email protected]>
  M:    Eric Paris <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/linux-audit
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
@@@ -3616,6 -3767,7 +3616,6 @@@ F:      net/bluetooth
  
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
 -M:    Veaceslav Falico <[email protected]>
  M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -3868,13 -4020,6 +3868,13 @@@ L:    [email protected]
  S:    Maintained
  F:    tools/testing/selftests/bpf/
  
 +BPF [DOCUMENTATION] (Related to Standardization)
 +R:    David Vernet <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/bpf/instruction-set.rst
 +
  BPF [MISC]
  L:    [email protected]
  S:    Odd Fixes
@@@ -4154,17 -4299,6 +4154,17 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
 +BROADCOM Broadband SoC High Speed SPI Controller DRIVER
 +M:    William Zhang <[email protected]>
 +M:    Kursad Oney <[email protected]>
 +M:    Jonas Gorski <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/brcm,bcm63xx-hsspi.yaml
 +F:    drivers/spi/spi-bcm63xx-hsspi.c
 +F:    drivers/spi/spi-bcmbca-hsspi.c
 +
  BROADCOM ETHERNET PHY DRIVERS
  M:    Florian Fainelli <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
@@@ -4670,11 -4804,12 +4670,11 @@@ F:   net/sched/sch_etf.
  F:    net/sched/sch_taprio.c
  
  CC2520 IEEE-802.15.4 RADIO DRIVER
 -M:    Varka Bhadram <[email protected]>
 +M:    Stefan Schmidt <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  F:    drivers/net/ieee802154/cc2520.c
 -F:    include/linux/spi/cc2520.h
  
  CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
  M:    Gilad Ben-Yossef <[email protected]>
@@@ -4850,13 -4985,6 +4850,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:    sound/soc/codecs/cros_ec_codec.*
  
 +CHROMEOS EC UART DRIVER
 +M:    Bhanu Prakash Maiya <[email protected]>
 +R:    Benson Leung <[email protected]>
 +R:    Tzung-Bi Shih <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/chrome/cros_ec_uart.c
 +
  CHROMEOS EC SUBDRIVERS
  M:    Benson Leung <[email protected]>
  R:    Guenter Roeck <[email protected]>
@@@ -4870,9 -4998,8 +4870,9 @@@ CHROMEOS EC USB TYPE-C DRIVE
  M:    Prashant Malani <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/chrome/cros_ec_typec.c
 +F:    drivers/platform/chrome/cros_ec_typec.*
  F:    drivers/platform/chrome/cros_typec_switch.c
 +F:    drivers/platform/chrome/cros_typec_vdm.*
  
  CHROMEOS EC USB PD NOTIFY DRIVER
  M:    Prashant Malani <[email protected]>
@@@ -5663,11 -5790,6 +5663,11 @@@ M:    SeongJae Park <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +W:    https://damonitor.github.io
 +P:    Documentation/mm/damon/maintainer-profile.rst
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 +T:    quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sj/linux.git damon/next
  F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
  F:    Documentation/admin-guide/mm/damon/
  F:    Documentation/mm/damon/
@@@ -5805,6 -5927,7 +5805,6 @@@ F:      Documentation/ABI/testing/sysfs-plat
  F:    drivers/platform/x86/dell/dell-wmi-ddv.c
  
  DELL WMI SYSMAN DRIVER
 -M:    Divya Bharathi <[email protected]>
  M:    Prasanth Ksr <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5912,7 -6035,6 +5912,7 @@@ M:      Dan Williams <[email protected]
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/dax/
  
@@@ -5977,7 -6099,7 +5977,7 @@@ S:      Supporte
  F:    Documentation/networking/devlink
  F:    include/net/devlink.h
  F:    include/uapi/linux/devlink.h
 -F:    net/core/devlink.c
 +F:    net/devlink/
  
  DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT
  M:    Christoph Niedermaier <[email protected]>
@@@ -6300,7 -6422,6 +6300,7 @@@ T:      git git://git.linbit.com/linux-drbd.
  T:    git git://git.linbit.com/drbd-8.4.git
  F:    Documentation/admin-guide/blockdev/
  F:    drivers/block/drbd/
 +F:    include/linux/drbd*
  F:    lib/lru_cache.c
  
  DRIVER COMPONENT FRAMEWORK
@@@ -6429,14 -6550,6 +6429,14 @@@ S:    Maintaine
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/tiny/gm12u320.c
  
 +DRM DRIVER FOR HIMAX HX8394 MIPI-DSI LCD panels
 +M:    Ondrej Jirman <[email protected]>
 +M:    Javier Martinez Canillas <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml
 +F:    drivers/gpu/drm/panel/panel-himax-hx8394.c
 +
  DRM DRIVER FOR HX8357D PANELS
  M:    Emma Anholt <[email protected]>
  S:    Maintained
@@@ -6458,6 -6571,11 +6458,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
  F:    drivers/gpu/drm/tiny/ili9486.c
  
 -DRM DRIVER FOR INTEL I810 VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/i810/
 -F:    include/uapi/drm/i810_drm.h
 -
  DRM DRIVER FOR JADARD JD9365DA-H3 MIPI-DSI LCD PANELS
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -6486,6 -6604,11 +6486,6 @@@ S:     Maintaine
  F:    Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
  F:    drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
  
 -DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/mga/
 -F:    include/uapi/drm/mga_drm.h
 -
  DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  R:    Thomas Zimmermann <[email protected]>
@@@ -6604,6 -6727,11 +6604,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/qxl/
  F:    include/uapi/drm/qxl_drm.h
  
 -DRM DRIVER FOR RAGE 128 VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/r128/
 -F:    include/uapi/drm/r128_drm.h
 -
  DRM DRIVER FOR RAYDIUM RM67191 PANELS
  M:    Robert Chiras <[email protected]>
  S:    Maintained
@@@ -6631,6 -6759,11 +6631,6 @@@ S:     Maintaine
  F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
  
 -DRM DRIVER FOR SAVAGE VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/savage/
 -F:    include/uapi/drm/savage_drm.h
 -
  DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
  M:    Thomas Zimmermann <[email protected]>
  M:    Javier Martinez Canillas <[email protected]>
@@@ -6646,6 -6779,11 +6646,6 @@@ F:     include/drm/drm_aperture.
  F:    include/linux/aperture.h
  F:    include/video/nomodeset.h
  
 -DRM DRIVER FOR SIS VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/sis/
 -F:    include/uapi/drm/sis_drm.h
 -
  DRM DRIVER FOR SITRONIX ST7586 PANELS
  M:    David Lechner <[email protected]>
  S:    Maintained
@@@ -6673,6 -6811,10 +6673,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/ste,mcde.yaml
  F:    drivers/gpu/drm/mcde/
  
 -DRM DRIVER FOR TDFX VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/tdfx/
 -
  DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -6772,16 -6914,6 +6772,16 @@@ C:    irc://irc.oftc.net/dri-deve
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git
  F:    Documentation/accel/
  F:    drivers/accel/
 +F:    include/drm/drm_accel.h
 +
 +DRM ACCEL DRIVERS FOR INTEL VPU
 +M:    Jacek Lawrynowicz <[email protected]>
 +M:    Stanislaw Gruszka <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/accel/ivpu/
 +F:    include/uapi/drm/ivpu_accel.h
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <[email protected]>
@@@ -6816,7 -6948,7 +6816,7 @@@ F:      drivers/gpu/drm/atmel-hlcdc
  DRM DRIVERS FOR BRIDGE CHIPS
  M:    Andrzej Hajda <[email protected]>
  M:    Neil Armstrong <[email protected]>
 -M:    Robert Foss <robert.foss@linaro.org>
 +M:    Robert Foss <rfoss@kernel.org>
  R:    Laurent Pinchart <[email protected]>
  R:    Jonas Karlman <[email protected]>
  R:    Jernej Skrabec <[email protected]>
@@@ -6852,7 -6984,7 +6852,7 @@@ M:      Philipp Zabel <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/imx/
 -F:    drivers/gpu/drm/imx/
 +F:    drivers/gpu/drm/imx/ipuv3/
  F:    drivers/gpu/ipu-v3/
  
  DRM DRIVERS FOR FREESCALE IMX BRIDGE
@@@ -6875,10 -7007,9 +6875,10 @@@ F:    drivers/gpu/drm/gma500
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
  M:    Tian Tao  <[email protected]>
 -R:    John Stultz <[email protected]>
  R:    Xinwei Kong <[email protected]>
 -R:    Chen Feng <[email protected]>
 +R:    Sumit Semwal <[email protected]>
 +R:    Yongqin Liu <[email protected]>
 +R:    John Stultz <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6919,7 -7050,7 +6919,7 @@@ M:      Thierry Reding <thierry.reding@gmail
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://anongit.freedesktop.org/tegra/linux.git
 +T:    git https://gitlab.freedesktop.org/drm/tegra.git
  F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml
  F:    Documentation/devicetree/bindings/gpu/host1x/
  F:    drivers/gpu/drm/tegra/
@@@ -7485,6 -7616,7 +7485,6 @@@ S:      Maintaine
  F:    drivers/firmware/efi/test/
  
  EFI VARIABLE FILESYSTEM
 -M:    Matthew Garrett <[email protected]>
  M:    Jeremy Kerr <[email protected]>
  M:    Ard Biesheuvel <[email protected]>
  L:    [email protected]
@@@ -7613,7 -7745,6 +7613,7 @@@ R:      Jeffle Xu <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
 +F:    Documentation/ABI/testing/sysfs-fs-erofs
  F:    Documentation/filesystems/erofs.rst
  F:    fs/erofs/
  F:    include/trace/events/erofs.h
@@@ -7764,11 -7895,7 +7764,11 @@@ F:    include/linux/extcon
  
  EXTRA BOOT CONFIG
  M:    Masami Hiramatsu <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +Q:    https://patchwork.kernel.org/project/linux-trace-kernel/list/
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
  F:    Documentation/admin-guide/bootconfig.rst
  F:    fs/proc/bootconfig.c
  F:    include/linux/bootconfig.h
@@@ -8069,7 -8196,7 +8069,7 @@@ F:      drivers/fpga/microchip-spi.
  FPU EMULATOR
  M:    Bill Metzenthen <[email protected]>
  S:    Maintained
 -W:    http://floatingpoint.sourceforge.net/emulator/index.html
 +W:    https://floatingpoint.billm.au/
  F:    arch/x86/math-emu/
  
  FRAMEBUFFER CORE
@@@ -8341,16 -8468,16 +8341,16 @@@ F:   fs/fscache
  F:    include/linux/fscache*.h
  
  FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
 +M:    Eric Biggers <[email protected]>
  M:    Theodore Y. Ts'o <[email protected]>
  M:    Jaegeuk Kim <[email protected]>
 -M:    Eric Biggers <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-fscrypt/list/
 -T:    git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git
 +T:    git https://git.kernel.org/pub/scm/fs/fscrypt/linux.git
  F:    Documentation/filesystems/fscrypt.rst
  F:    fs/crypto/
 -F:    include/linux/fscrypt*.h
 +F:    include/linux/fscrypt.h
  F:    include/uapi/linux/fscrypt.h
  
  FSI SUBSYSTEM
@@@ -8393,10 -8520,10 +8393,10 @@@ F:   include/linux/fsnotify*.
  FSVERITY: READ-ONLY FILE-BASED AUTHENTICITY PROTECTION
  M:    Eric Biggers <[email protected]>
  M:    Theodore Y. Ts'o <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
 -Q:    https://patchwork.kernel.org/project/linux-fscrypt/list/
 -T:    git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity
 +Q:    https://patchwork.kernel.org/project/fsverity/list/
 +T:    git https://git.kernel.org/pub/scm/fs/fsverity/linux.git
  F:    Documentation/filesystems/fsverity.rst
  F:    fs/verity/
  F:    include/linux/fsverity.h
@@@ -8444,7 -8571,6 +8444,7 @@@ F:      kernel/trace/fgraph.
  F:    arch/*/*/*/*ftrace*
  F:    arch/*/*/*ftrace*
  F:    include/*/ftrace.h
 +F:    samples/ftrace
  
  FUNGIBLE ETHERNET DRIVERS
  M:    Dimitris Michailidis <[email protected]>
@@@ -8917,15 -9043,13 +8917,15 @@@ F:   block/partitions/efi.
  
  HABANALABS PCI DRIVER
  M:    Oded Gabbay <[email protected]>
 +L:    [email protected]
  S:    Supported
 +C:    irc://irc.oftc.net/dri-devel
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git
  F:    Documentation/ABI/testing/debugfs-driver-habanalabs
  F:    Documentation/ABI/testing/sysfs-driver-habanalabs
 -F:    drivers/misc/habanalabs/
 +F:    drivers/accel/habanalabs/
  F:    include/trace/events/habanalabs.h
 -F:    include/uapi/misc/habanalabs.h
 +F:    include/uapi/drm/habanalabs_accel.h
  
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -9076,12 -9200,9 +9076,12 @@@ M:    Benjamin Tissoires <benjamin.tissoir
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 +F:    Documentation/hid/
  F:    drivers/hid/
  F:    include/linux/hid*
  F:    include/uapi/linux/hid*
 +F:    samples/hid/
 +F:    tools/testing/selftests/hid/
  
  HID LOGITECH DRIVERS
  R:    Filipe Laíns <[email protected]>
@@@ -9089,13 -9210,6 +9089,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/hid/hid-logitech-*
  
 +HID++ LOGITECH DRIVERS
 +R:    Filipe Laíns <[email protected]>
 +R:    Bastien Nocera <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-logitech-hidpp.c
 +
  HID PLAYSTATION DRIVER
  M:    Roderick Colenbrander <[email protected]>
  L:    [email protected]
@@@ -9185,7 -9299,7 +9185,7 @@@ F:      net/dsa/tag_hellcreek.
  
  HISILICON DMA DRIVER
  M:    Zhou Wang <[email protected]>
 -M:    Jie Hai <haijie1@hisilicon.com>
 +M:    Jie Hai <haijie1@huawei.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/dma/hisi_dma.c
@@@ -9261,15 -9375,11 +9261,15 @@@ F:   drivers/perf/hisilicon/hns3_pmu.
  
  HISILICON PTT DRIVER
  M:    Yicong Yang <[email protected]>
 +M:    Jonathan Cameron <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-devices-hisi_ptt
  F:    Documentation/trace/hisi-ptt.rst
  F:    drivers/hwtracing/ptt/
 +F:    tools/perf/arch/arm64/util/hisi-ptt.c
 +F:    tools/perf/util/hisi-ptt*
 +F:    tools/perf/util/hisi-ptt-decoder/*
  
  HISILICON QM DRIVER
  M:    Weili Qian <[email protected]>
@@@ -9356,7 -9466,7 +9356,7 @@@ F:      Documentation/mm/hmm.rs
  F:    include/linux/hmm*
  F:    lib/test_hmm*
  F:    mm/hmm*
 -F:    tools/testing/selftests/vm/*hmm*
 +F:    tools/testing/selftests/mm/*hmm*
  
  HOST AP DRIVER
  M:    Jouni Malinen <[email protected]>
@@@ -9879,7 -9989,7 +9879,7 @@@ S:      Maintaine
  T:    git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git
  F:    Documentation/filesystems/idmappings.rst
  F:    tools/testing/selftests/mount_setattr/
 -F:    include/linux/mnt_idmapping.h
 +F:    include/linux/mnt_idmapping.*
  
  IDT VersaClock 5 CLOCK DRIVER
  M:    Luca Ceresoli <[email protected]>
@@@ -9890,7 -10000,6 +9890,7 @@@ F:     drivers/clk/clk-versaclock5.
  IEEE 802.15.4 SUBSYSTEM
  M:    Alexander Aring <[email protected]>
  M:    Stefan Schmidt <[email protected]>
 +M:    Miquel Raynal <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://linux-wpan.org/
@@@ -10050,13 -10159,6 +10050,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/iio/pressure/dps310.c
  
 +INFINEON PEB2466 ASoC CODEC
 +M:    Herve Codina <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/infineon,peb2466.yaml
 +F:    sound/soc/codecs/peb2466.c
 +
  INFINIBAND SUBSYSTEM
  M:    Jason Gunthorpe <[email protected]>
  M:    Leon Romanovsky <[email protected]>
@@@ -10357,6 -10459,7 +10357,6 @@@ L:   [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    drivers/iommu/intel/
 -F:    include/linux/intel-svm.h
  
  INTEL IPU3 CSI-2 CIO2 DRIVER
  M:    Yong Zhi <[email protected]>
@@@ -10464,7 -10567,6 +10464,7 @@@ F:   drivers/watchdog/mei_wdt.
  F:    include/linux/mei_aux.h
  F:    include/linux/mei_cl_bus.h
  F:    include/uapi/linux/mei.h
 +F:    include/uapi/linux/uuid.h
  F:    samples/mei/*
  
  INTEL MAX 10 BMC MFD DRIVER
@@@ -10474,7 -10576,7 +10474,7 @@@ S:   Maintaine
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc
  F:    Documentation/hwmon/intel-m10-bmc-hwmon.rst
  F:    drivers/hwmon/intel-m10-bmc-hwmon.c
 -F:    drivers/mfd/intel-m10-bmc.c
 +F:    drivers/mfd/intel-m10-bmc*
  F:    include/linux/mfd/intel-m10-bmc.h
  
  INTEL MENLOW THERMAL DRIVER
@@@ -10581,13 -10683,6 +10581,13 @@@ S: Maintaine
  F:    arch/x86/include/asm/intel_telemetry.h
  F:    drivers/platform/x86/intel/telemetry/
  
 +INTEL TPMI DRIVER
 +M:    Srinivas Pandruvada <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/intel/tpmi.c
 +F:    include/linux/intel_tpmi.h
 +
  INTEL UNCORE FREQUENCY CONTROL
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
@@@ -10825,13 -10920,6 +10825,13 @@@ M: David Sterba <[email protected]
  S:    Odd Fixes
  F:    drivers/tty/ipwireless/
  
 +IRON DEVICE AUDIO CODEC DRIVERS
 +M:    Kiseok Jo <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/irondevice,*
 +F:    sound/soc/codecs/sma*
 +
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
  S:    Maintained
@@@ -10847,8 -10935,6 +10847,8 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
 +F:    include/linux/group_cpus.h
 +F:    lib/group_cpus.c
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <[email protected]>
@@@ -11269,12 -11355,13 +11269,12 @@@ F:        virt/kvm/
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Marc Zyngier <[email protected]>
 +M:    Oliver Upton <[email protected]>
  R:    James Morse <[email protected]>
 -R:    Alexandru Elisei <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
 -R:    Oliver Upton <[email protected]>
 +R:    Zenghui Yu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
 -L:    [email protected] (deprecated, moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  F:    arch/arm64/include/asm/kvm*
@@@ -11587,12 -11674,6 +11587,12 @@@ M: John Hawley <[email protected]
  S:    Maintained
  F:    tools/testing/ktest
  
 +KTZ8866 BACKLIGHT DRIVER
 +M:    Jianhua Lu <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml
 +F:    drivers/video/backlight/ktz8866.c
 +
  L3MDEV
  M:    David Ahern <[email protected]>
  L:    [email protected]
@@@ -11605,7 -11686,7 +11605,7 @@@ M:   Mickaël Salaün <[email protected]
  L:    [email protected]
  S:    Supported
  W:    https://landlock.io
 -T:    git https://github.com/landlock-lsm/linux.git
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git
  F:    Documentation/security/landlock.rst
  F:    Documentation/userspace-api/landlock.rst
  F:    include/uapi/linux/landlock.h
@@@ -12099,13 -12180,6 +12099,13 @@@ F: drivers/*/*loongarch
  F:    Documentation/loongarch/
  F:    Documentation/translations/zh_CN/loongarch/
  
 +LOONGSON LS2X I2C DRIVER
 +M:    Binbin Zhou <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/loongson,ls2x-i2c.yaml
 +F:    drivers/i2c/busses/i2c-ls2x.c
 +
  LOONGSON-2 SOC SERIES GUTS DRIVER
  M:    Yinbo Zhu <[email protected]>
  L:    [email protected]
@@@ -12741,9 -12815,9 +12741,9 @@@ F:   drivers/iio/potentiometer/mcp4018.
  F:    drivers/iio/potentiometer/mcp4531.c
  
  MCR20A IEEE-802.15.4 RADIO DRIVER
 -M:    Xue Liu <[email protected]>
 +M:    Stefan Schmidt <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  W:    https://github.com/xueliu/mcr20a-linux
  F:    Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
  F:    drivers/net/ieee802154/mcr20a.c
@@@ -13139,7 -13213,7 +13139,7 @@@ F:   drivers/phy/ralink/phy-mt7621-pci.
  MEDIATEK NAND CONTROLLER DRIVER
  L:    [email protected]
  S:    Orphan
- F:    Documentation/devicetree/bindings/mtd/mtk-nand.txt
+ F:    Documentation/devicetree/bindings/mtd/mediatek,mtk-nfc.yaml
  F:    drivers/mtd/nand/raw/mtk_*
  
  MEDIATEK PMIC LED DRIVER
@@@ -13400,7 -13474,7 +13400,7 @@@ M:   Andrew Morton <akpm@linux-foundation
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mm.org
 -T:    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
  T:    quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
  F:    include/linux/gfp.h
  F:    include/linux/gfp_types.h
@@@ -13409,8 -13483,7 +13409,8 @@@ F:   include/linux/mm.
  F:    include/linux/mmzone.h
  F:    include/linux/pagewalk.h
  F:    mm/
 -F:    tools/testing/selftests/vm/
 +F:    tools/mm/
 +F:    tools/testing/selftests/mm/
  
  VMALLOC
  M:    Andrew Morton <[email protected]>
@@@ -13419,7 -13492,7 +13419,7 @@@ R:   Christoph Hellwig <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mm.org
 -T:    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
  F:    include/linux/vmalloc.h
  F:    mm/vmalloc.c
  
@@@ -13545,19 -13618,6 +13545,19 @@@ W: http://www.monstr.eu/fdt
  T:    git git://git.monstr.eu/linux-2.6-microblaze.git
  F:    arch/microblaze/
  
 +MICROBLAZE TMR MANAGER
 +M:    Appana Durga Kedareswara rao <[email protected]>
 +S:    Supported
 +F:    Documentation/ABI/testing/sysfs-driver-xilinx-tmr-manager
 +F:    Documentation/devicetree/bindings/misc/xlnx,tmr-manager.yaml
 +F:    drivers/misc/xilinx_tmr_manager.c
 +
 +MICROBLAZE TMR INJECT
 +M:    Appana Durga Kedareswara rao <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml
 +F:    drivers/misc/xilinx_tmr_inject.c
 +
  MICROCHIP AT91 DMA DRIVERS
  M:    Ludovic Desroches <[email protected]>
  M:    Tudor Ambarus <[email protected]>
@@@ -13650,7 -13710,6 +13650,7 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
  F:    Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
  F:    drivers/net/dsa/microchip/*
 +F:    include/linux/dsa/ksz_common.h
  F:    include/linux/platform_data/microchip-ksz.h
  F:    net/dsa/tag_ksz.c
  
@@@ -13733,13 -13792,6 +13733,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-mchp-pci1xxxx.c
  
 +MICROCHIP PCIe UART DRIVER
 +M:    Kumaravel Thiagarajan <[email protected]>
 +M:    Tharun Kumar P <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/tty/serial/8250/8250_pci1xxxx.c
 +
  MICROCHIP PWM DRIVER
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -14090,7 -14142,6 +14090,7 @@@ M:   Saravanan Sekar <[email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/mfd/mps,mp2629.yaml
  F:    Documentation/devicetree/bindings/regulator/mps,mp*.yaml
 +F:    drivers/hwmon/pmbus/mpq7932.c
  F:    drivers/iio/adc/mp2629_adc.c
  F:    drivers/mfd/mp2629.c
  F:    drivers/power/supply/mp2629_charger.c
@@@ -14099,16 -14150,6 +14099,16 @@@ F: drivers/regulator/mpq7920.
  F:    drivers/regulator/mpq7920.h
  F:    include/linux/mfd/mp2629.h
  
 +MOST(R) TECHNOLOGY DRIVER
 +M:    Parthiban Veerasooran <[email protected]>
 +M:    Christian Gromm <[email protected]>
 +S:    Maintained
 +F:    Documentation/ABI/testing/configfs-most
 +F:    Documentation/ABI/testing/sysfs-bus-most
 +F:    drivers/most/
 +F:    drivers/staging/most/
 +F:    include/linux/most.h
 +
  MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
  S:    Orphan
  W:    http://popies.net/meye/
@@@ -14121,7 -14162,6 +14121,7 @@@ M:   Peter Geis <[email protected]
  M:    Frank <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/motorcomm,yt8xxx.yaml
  F:    drivers/net/phy/motorcomm.c
  
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
@@@ -14138,9 -14178,9 +14138,9 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-mr800.c
  
  MRF24J40 IEEE 802.15.4 RADIO DRIVER
 -M:    Alan Ott <[email protected]>
 +M:    Stefan Schmidt <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
  F:    drivers/net/ieee802154/mrf24j40.c
  
@@@ -14240,7 -14280,7 +14240,7 @@@ F:   drivers/media/i2c/mt9v111.
  
  MULTIFUNCTION DEVICES (MFD)
  M:    Lee Jones <[email protected]>
 -S:    Supported
 +S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  F:    Documentation/devicetree/bindings/mfd/
  F:    drivers/mfd/
@@@ -14502,8 -14542,6 +14502,8 @@@ M:   Florian Fainelli <[email protected]
  M:    Vladimir Oltean <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
 +F:    Documentation/devicetree/bindings/net/ethernet-switch-port.yaml
 +F:    Documentation/devicetree/bindings/net/ethernet-switch.yaml
  F:    drivers/net/dsa/
  F:    include/linux/dsa/
  F:    include/linux/platform_data/dsa.h
@@@ -14522,10 -14560,8 +14522,10 @@@ Q: https://patchwork.kernel.org/project
  B:    mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 +F:    Documentation/core-api/netlink.rst
  F:    Documentation/networking/
  F:    Documentation/process/maintainer-netdev.rst
 +F:    Documentation/userspace-api/netlink/
  F:    include/linux/in.h
  F:    include/linux/net.h
  F:    include/linux/netdevice.h
@@@ -14537,7 -14573,6 +14537,7 @@@ F:   include/uapi/linux/netdevice.
  F:    lib/net_utils.c
  F:    lib/random32.c
  F:    net/
 +F:    tools/net/
  F:    tools/testing/selftests/net/
  
  NETWORKING [IPSEC]
@@@ -14566,6 -14601,7 +14566,6 @@@ F:   tools/testing/selftests/net/ipsec.
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
 -M:    Hideaki YOSHIFUJI <[email protected]>
  M:    David Ahern <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14598,6 -14634,7 +14598,6 @@@ F:   net/netfilter/xt_SECMARK.
  F:    net/netlabel/
  
  NETWORKING [MPTCP]
 -M:    Mat Martineau <[email protected]>
  M:    Matthieu Baerts <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -14882,8 -14919,7 +14882,8 @@@ T:   git://git.infradead.org/nvme.gi
  F:    Documentation/nvme/
  F:    drivers/nvme/host/
  F:    drivers/nvme/common/
 -F:    include/linux/nvme*
 +F:    include/linux/nvme.h
 +F:    include/linux/nvme-*.h
  F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS FABRICS AUTHENTICATION
@@@ -14983,16 -15019,14 +14983,16 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
  F:    drivers/iio/adc/imx8qxp-adc.c
  
 -NXP i.MX 7D/6SX/6UL AND VF610 ADC DRIVER
 +NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
  M:    Haibo Chen <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
  F:    Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
 +F:    Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml
  F:    drivers/iio/adc/imx7d_adc.c
 +F:    drivers/iio/adc/imx93_adc.c
  F:    drivers/iio/adc/vf610_adc.c
  
  NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
@@@ -15117,7 -15151,6 +15117,7 @@@ M:   Colin Foster <colin.foster@in-advant
  S:    Supported
  F:    Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml
  F:    drivers/mfd/ocelot*
 +F:    drivers/net/dsa/ocelot/ocelot_ext.c
  F:    include/linux/mfd/ocelot.h
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
@@@ -15281,6 -15314,7 +15281,6 @@@ Q:   http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  F:    arch/arm/configs/omap1_defconfig
  F:    arch/arm/mach-omap1/
 -F:    arch/arm/plat-omap/
  F:    drivers/i2c/busses/i2c-omap.c
  F:    include/linux/platform_data/ams-delta-fiq.h
  F:    include/linux/platform_data/i2c-omap.h
@@@ -15295,6 -15329,7 +15295,6 @@@ Q:   http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  F:    arch/arm/configs/omap2plus_defconfig
  F:    arch/arm/mach-omap2/
 -F:    arch/arm/plat-omap/
  F:    drivers/bus/ti-sysc.c
  F:    drivers/i2c/busses/i2c-omap.c
  F:    drivers/irqchip/irq-omap-intc.c
@@@ -15538,7 -15573,6 +15538,7 @@@ F:   drivers/mtd/nand/onenand
  F:    include/linux/mtd/onenand*.h
  
  ONEXPLAYER FAN DRIVER
 +M:    Derek John Clark <[email protected]>
  M:    Joaquín Ignacio Aramendía <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -15550,13 -15584,6 +15550,13 @@@ L: [email protected]
  S:    Maintained
  F:    arch/mips/boot/dts/ralink/omega2p.dts
  
 +ONSEMI ETHERNET PHY DRIVERS
 +M:    Piergiorgio Beruto <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.onsemi.com
 +F:    drivers/net/phy/ncn*
 +
  OP-TEE DRIVER
  M:    Jens Wiklander <[email protected]>
  L:    [email protected]
@@@ -15631,7 -15658,7 +15631,7 @@@ OPENRISC ARCHITECTUR
  M:    Jonas Bonn <[email protected]>
  M:    Stefan Kristiansson <[email protected]>
  M:    Stafford Horne <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Maintained
  W:    http://openrisc.io
  T:    git https://github.com/openrisc/linux.git
@@@ -15722,12 -15749,6 +15722,12 @@@ S: Maintaine
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/p54
  F:    drivers/net/wireless/intersil/p54/
  
 +PACKET SOCKETS
 +M:    Willem de Bruijn <[email protected]>
 +S:    Maintained
 +F:    include/uapi/linux/if_packet.h
 +F:    net/packet/af_packet.c
 +
  PACKING
  M:    Vladimir Oltean <[email protected]>
  L:    [email protected]
@@@ -15823,6 -15844,13 +15823,6 @@@ F:  arch/*/include/asm/paravirt*.
  F:    arch/*/kernel/paravirt*
  F:    include/linux/hypervisor.h
  
 -PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
 -M:    Tim Waugh <[email protected]>
 -L:    [email protected] (subscribers-only)
 -S:    Maintained
 -F:    Documentation/admin-guide/blockdev/paride.rst
 -F:    drivers/block/paride/
 -
  PARISC ARCHITECTURE
  M:    "James E.J. Bottomley" <[email protected]>
  M:    Helge Deller <[email protected]>
@@@ -16080,7 -16108,7 +16080,7 @@@ F:   drivers/pci/controller/pci-v3-semi.
  
  PCI ENDPOINT SUBSYSTEM
  M:    Lorenzo Pieralisi <[email protected]>
 -R:    Krzysztof Wilczyński <[email protected]>
 +M:    Krzysztof Wilczyński <[email protected]>
  R:    Manivannan Sadhasivam <[email protected]>
  R:    Kishon Vijay Abraham I <[email protected]>
  L:    [email protected]
@@@ -16088,7 -16116,7 +16088,7 @@@ S:   Supporte
  Q:    https://patchwork.kernel.org/project/linux-pci/list/
  B:    https://bugzilla.kernel.org
  C:    irc://irc.oftc.net/linux-pci
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
  F:    Documentation/PCI/endpoint/*
  F:    Documentation/misc-devices/pci-endpoint-test.rst
  F:    drivers/misc/pci_endpoint_test.c
@@@ -16123,7 -16151,7 +16123,7 @@@ S:   Supporte
  Q:    https://patchwork.kernel.org/project/linux-pci/list/
  B:    https://bugzilla.kernel.org
  C:    irc://irc.oftc.net/linux-pci
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
  F:    Documentation/driver-api/pci/p2pdma.rst
  F:    drivers/pci/p2pdma.c
  F:    include/linux/pci-p2pdma.h
@@@ -16145,14 -16173,14 +16145,14 @@@ F:        drivers/pci/controller/pci-xgene-msi
  
  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
  M:    Lorenzo Pieralisi <[email protected]>
 +M:    Krzysztof Wilczyński <[email protected]>
  R:    Rob Herring <[email protected]>
 -R:    Krzysztof Wilczyński <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pci/list/
  B:    https://bugzilla.kernel.org
  C:    irc://irc.oftc.net/linux-pci
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
  F:    Documentation/devicetree/bindings/pci/
  F:    drivers/pci/controller/
  F:    drivers/pci/pci-bridge-emul.c
@@@ -16165,7 -16193,7 +16165,7 @@@ S:   Supporte
  Q:    https://patchwork.kernel.org/project/linux-pci/list/
  B:    https://bugzilla.kernel.org
  C:    irc://irc.oftc.net/linux-pci
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
  F:    Documentation/PCI/
  F:    Documentation/devicetree/bindings/pci/
  F:    arch/x86/kernel/early-quirks.c
@@@ -16279,7 -16307,7 +16279,7 @@@ M:   Shawn Lin <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/rockchip-pcie*
 +F:    Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie*
  F:    drivers/pci/controller/pcie-rockchip*
  
  PCIE DRIVER FOR SOCIONEXT UNIPHIER
@@@ -16384,7 -16412,6 +16384,7 @@@ R:   Mark Rutland <[email protected]
  R:    Alexander Shishkin <[email protected]>
  R:    Jiri Olsa <[email protected]>
  R:    Namhyung Kim <[email protected]>
 +R:    Ian Rogers <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -16583,26 -16610,12 +16583,26 @@@ S:        Supporte
  F:    Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml
  F:    drivers/input/keyboard/pinephone-keyboard.c
  
 +PKTCDVD DRIVER
 +M:    [email protected]
 +S:    Orphan
 +F:    drivers/block/pktcdvd.c
 +F:    include/linux/pktcdvd.h
 +F:    include/uapi/linux/pktcdvd.h
 +
  PLANTOWER PMS7003 AIR POLLUTION SENSOR DRIVER
  M:    Tomasz Duszynski <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
  F:    drivers/iio/chemical/pms7003.c
  
 +PLCA RECONCILIATION SUBLAYER (IEEE802.3 Clause 148)
 +M:    Piergiorgio Beruto <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/mdio-open-alliance.h
 +F:    net/ethtool/plca.c
 +
  PLDMFW LIBRARY
  M:    Jacob Keller <[email protected]>
  S:    Maintained
@@@ -17200,13 -17213,6 +17200,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
  F:    drivers/net/wireless/ath/ath11k/
  
 +QUALCOMM ATH12K WIRELESS DRIVER
 +M:    Kalle Valo <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +F:    drivers/net/wireless/ath/ath12k/
 +
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
  M:    Toke Høiland-Jørgensen <[email protected]>
  L:    [email protected]
@@@ -17224,7 -17230,7 +17224,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/wwan/qcom_bam_dmux.c
  
  QUALCOMM CAMERA SUBSYSTEM DRIVER
 -M:    Robert Foss <robert.foss@linaro.org>
 +M:    Robert Foss <rfoss@kernel.org>
  M:    Todor Tomov <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17304,7 -17310,7 +17304,7 @@@ F:   drivers/dma/qcom/hidma
  
  QUALCOMM I2C CCI DRIVER
  M:    Loic Poulain <[email protected]>
 -M:    Robert Foss <robert.foss@linaro.org>
 +M:    Robert Foss <rfoss@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17778,13 -17784,6 +17778,13 @@@ F: Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/renesas/
  F:    include/linux/sh_eth.h
  
 +RENESAS IDT821034 ASoC CODEC
 +M:    Herve Codina <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/renesas,idt821034.yaml
 +F:    sound/soc/codecs/idt821034.c
 +
  RENESAS R-CAR GYROADC DRIVER
  M:    Marek Vasut <[email protected]>
  L:    [email protected]
@@@ -17860,14 -17859,6 +17860,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml
  F:    drivers/rtc/rtc-rzn1.c
  
 +RENESAS RZ/N1 USBF CONTROLLER DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml
 +F:    drivers/usb/gadget/udc/renesas_usbf.c
 +
  RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
  M:    Miquel Raynal <[email protected]>
  L:    [email protected]
@@@ -17958,7 -17949,6 +17958,7 @@@ M:   Albert Ou <[email protected]
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-riscv/list/
 +C:    irc://irc.libera.chat/riscv
  P:    Documentation/riscv/patch-acceptance.rst
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  F:    arch/riscv/
@@@ -18224,7 -18214,6 +18224,7 @@@ L:   [email protected]
  S:    Supported
  W:    https://github.com/Rust-for-Linux/linux
  B:    https://github.com/Rust-for-Linux/linux/issues
 +C:    zulip://rust-for-linux.zulipchat.com
  T:    git https://github.com/Rust-for-Linux/linux.git rust-next
  F:    Documentation/rust/
  F:    rust/
@@@ -18264,7 -18253,6 +18264,7 @@@ F:   Documentation/driver-api/s390-driver
  F:    Documentation/s390/
  F:    arch/s390/
  F:    drivers/s390/
 +F:    drivers/watchdog/diag288_wdt.c
  
  S390 COMMON I/O LAYER
  M:    Vineeth Vijayan <[email protected]>
@@@ -18325,13 -18313,6 +18325,13 @@@ F: arch/s390/pci
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  F:    Documentation/s390/pci.rst
  
 +S390 SCM DRIVER
 +M:    Vineeth Vijayan <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/s390/block/scm*
 +F:    drivers/s390/cio/scm.c
 +
  S390 VFIO AP DRIVER
  M:    Tony Krowiak <[email protected]>
  M:    Halil Pasic <[email protected]>
@@@ -18375,6 -18356,19 +18375,6 @@@ L:  [email protected]
  S:    Supported
  F:    drivers/s390/scsi/zfcp_*
  
 -S3C ADC BATTERY DRIVER
 -M:    Krzysztof Kozlowski <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes
 -F:    drivers/power/supply/s3c_adc_battery.c
 -F:    include/linux/s3c_adc_battery.h
 -
 -S3C24XX SD/MMC Driver
 -M:    Ben Dooks <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/mmc/host/s3cmci.*
 -
  SAA6588 RDS RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -18527,9 -18521,11 +18527,9 @@@ F:  Documentation/devicetree/bindings/cl
  F:    Documentation/devicetree/bindings/clock/samsung,s3c*
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
 -F:    include/dt-bindings/clock/s3c*.h
  F:    include/dt-bindings/clock/s5p*.h
  F:    include/dt-bindings/clock/samsung,*.h
  F:    include/linux/clk/samsung.h
 -F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
@@@ -18540,6 -18536,7 +18540,6 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/spi/samsung,spi*.yaml
  F:    drivers/spi/spi-s3c*
  F:    include/linux/platform_data/spi-s3c64xx.h
 -F:    include/linux/spi/s3c24xx-fiq.h
  
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <[email protected]>
@@@ -18673,9 -18670,9 +18673,9 @@@ F:   drivers/target
  F:    include/target/
  
  SCTP PROTOCOL
 -M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
  M:    Marcelo Ricardo Leitner <[email protected]>
 +M:    Xin Long <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://lksctp.sourceforge.net
@@@ -18898,7 -18895,6 +18898,7 @@@ M:   Edward Cree <[email protected]
  M:    Martin Habets <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/networking/devlink/sfc.rst
  F:    drivers/net/ethernet/sfc/
  
  SFF/SFP/SFP+ MODULE SUPPORT
@@@ -19110,6 -19106,14 +19110,6 @@@ M:  Simtec Linux Team <[email protected]
  S:    Supported
  W:    http://www.simtec.co.uk/products/EB110ATX/
  
 -SIMTEC EB2410ITX (BAST)
 -M:    Simtec Linux Team <[email protected]>
 -S:    Supported
 -W:    http://www.simtec.co.uk/products/EB2410ITX/
 -F:    arch/arm/mach-s3c/bast-ide.c
 -F:    arch/arm/mach-s3c/bast-irq.c
 -F:    arch/arm/mach-s3c/mach-bast.c
 -
  SIOX
  M:    Thorsten Scherer <[email protected]>
  M:    Uwe Kleine-König <[email protected]>
@@@ -19306,7 -19310,7 +19306,7 @@@ SOCIONEXT SYNQUACER I2C DRIVE
  M:    Ard Biesheuvel <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-synquacer.txt
 +F:    Documentation/devicetree/bindings/i2c/socionext,synquacer-i2c.yaml
  F:    drivers/i2c/busses/i2c-synquacer.c
  
  SOCIONEXT UNIPHIER SOUND DRIVER
@@@ -19314,13 -19318,6 +19314,13 @@@ L: [email protected] (moderat
  S:    Orphan
  F:    sound/soc/uniphier/
  
 +SOCKET TIMESTAMPING
 +M:    Willem de Bruijn <[email protected]>
 +S:    Maintained
 +F:    Documentation/networking/timestamping.rst
 +F:    include/uapi/linux/net_tstamp.h
 +F:    tools/testing/selftests/net/so_txtime.c
 +
  SOEKRIS NET48XX LED SUPPORT
  M:    Chris Boot <[email protected]>
  S:    Maintained
@@@ -19894,15 -19891,13 +19894,15 @@@ F:        Documentation/devicetree/bindings/cl
  F:    drivers/clk/starfive/clk-starfive-jh7100*
  F:    include/dt-bindings/clock/starfive-jh7100*.h
  
 -STARFIVE JH7100 PINCTRL DRIVER
 +STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <[email protected]>
 +M:    Jianlong Huang <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 -F:    drivers/pinctrl/starfive/
 +F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
 +F:    drivers/pinctrl/starfive/pinctrl-starfive-jh71*
  F:    include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
 +F:    include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
  
  STARFIVE JH7100 RESET CONTROLLER DRIVER
  M:    Emil Renner Berthing <[email protected]>
@@@ -19911,12 -19906,6 +19911,12 @@@ F: Documentation/devicetree/bindings/re
  F:    drivers/reset/reset-starfive-jh7100.c
  F:    include/dt-bindings/reset/starfive-jh7100.h
  
 +STARFIVE TRNG DRIVER
 +M:    Jia Jie Ho <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/rng/starfive*
 +F:    drivers/char/hw_random/jh7110-trng.c
 +
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <[email protected]>
  M:    Josh Poimboeuf <[email protected]>
@@@ -20074,7 -20063,6 +20074,7 @@@ F:   drivers/watchdog/sunplus_wdt.
  SUPERH
  M:    Yoshinori Sato <[email protected]>
  M:    Rich Felker <[email protected]>
 +M:    John Paul Adrian Glaubitz <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
@@@ -20090,8 -20078,7 +20090,8 @@@ L:   [email protected]
  S:    Supported
  B:    https://bugzilla.kernel.org
  F:    Documentation/power/
 -F:    arch/x86/kernel/acpi/
 +F:    arch/x86/kernel/acpi/sleep*
 +F:    arch/x86/kernel/acpi/wakeup*
  F:    drivers/base/power/
  F:    include/linux/freezer.h
  F:    include/linux/pm.h
@@@ -20308,7 -20295,8 +20308,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/system76_acpi.c
  
  SYSV FILESYSTEM
 -M:    Christoph Hellwig <[email protected]>
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/filesystems/sysv-fs.rst
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
@@@ -20699,7 -20687,6 +20699,7 @@@ S:   Supporte
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
  F:    Documentation/ABI/testing/sysfs-class-thermal
 +F:    Documentation/admin-guide/thermal/
  F:    Documentation/devicetree/bindings/thermal/
  F:    Documentation/driver-api/thermal/
  F:    drivers/thermal/
@@@ -20781,20 -20768,13 +20781,20 @@@ M:        Mika Westerberg <mika.westerberg@lin
  M:    Yehezkel Bernat <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/thunderbolt.c
 +F:    drivers/net/thunderbolt/
  
  THUNDERX GPIO DRIVER
  M:    Robert Richter <[email protected]>
  S:    Odd Fixes
  F:    drivers/gpio/gpio-thunderx.c
  
 +TI ADS7924 ADC DRIVER
 +M:    Hugo Villeneuve <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iio/adc/ti,ads7924.yaml
 +F:    drivers/iio/adc/ti-ads7924.c
 +
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -20863,6 -20843,7 +20863,6 @@@ W:   https://linuxtv.or
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  F:    drivers/media/platform/ti/davinci/
 -F:    drivers/staging/media/deprecated/vpfe_capture/
  F:    include/media/davinci/
  
  TI ENHANCED CAPTURE (eCAP) DRIVER
@@@ -20914,14 -20895,6 +20914,14 @@@ S: Maintaine
  F:    sound/soc/codecs/isabelle*
  F:    sound/soc/codecs/lm49453*
  
 +TI LMP92064 ADC DRIVER
 +M:    Leonard Göhrs <[email protected]>
 +R:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml
 +F:    drivers/iio/adc/ti-lmp92064.c
 +
  TI PCM3060 ASoC CODEC DRIVER
  M:    Kirill Marinushkin <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -20935,13 -20908,6 +20935,13 @@@ L: [email protected] (moderat
  S:    Odd Fixes
  F:    sound/soc/codecs/tas571x*
  
 +TI TMAG5273 MAGNETOMETER DRIVER
 +M:    Gerald Loacker <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/magnetometer/ti,tmag5273.yaml
 +F:    drivers/iio/magnetometer/tmag5273.c
 +
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <[email protected]>
  L:    [email protected]
@@@ -21421,12 -21387,6 +21421,12 @@@ L: [email protected]
  S:    Supported
  F:    drivers/ufs/host/*dwc*
  
 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER EXYNOS HOOKS
 +M:    Alim Akhtar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ufs/host/ufs-exynos*
 +
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
  M:    Stanley Chu <[email protected]>
  L:    [email protected]
@@@ -21434,14 -21394,6 +21434,14 @@@ L: [email protected] (
  S:    Maintained
  F:    drivers/ufs/host/ufs-mediatek*
  
 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER QUALCOMM HOOKS
 +M:    Manivannan Sadhasivam <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
 +F:    drivers/ufs/host/ufs-qcom*
 +
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER RENESAS HOOKS
  M:    Yoshihiro Shimoda <[email protected]>
  L:    [email protected]
@@@ -21751,7 -21703,6 +21751,7 @@@ F:   include/uapi/linux/uvcvideo.
  
  USB WEBCAM GADGET
  M:    Laurent Pinchart <[email protected]>
 +M:    Daniel Scally <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/usb/gadget/function/*uvc*
@@@ -21787,13 -21738,6 +21787,13 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/admin-guide/media/zr364xx*
  F:    drivers/staging/media/deprecated/zr364xx/
  
 +USER DATAGRAM PROTOCOL (UDP)
 +M:    Willem de Bruijn <[email protected]>
 +S:    Maintained
 +F:    include/linux/udp.h
 +F:    net/ipv4/udp.c
 +F:    net/ipv6/udp.c
 +
  USER-MODE LINUX (UML)
  M:    Richard Weinberger <[email protected]>
  M:    Anton Ivanov <[email protected]>
@@@ -21839,10 -21783,13 +21839,10 @@@ W:        http://en.wikipedia.org/wiki/Util-li
  T:    git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
  
  UUID HELPERS
 -M:    Christoph Hellwig <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.infradead.org/users/hch/uuid.git
  F:    include/linux/uuid.h
 -F:    include/uapi/linux/uuid.h
  F:    lib/test_uuid.c
  F:    lib/uuid.c
  
@@@ -21882,6 -21829,7 +21882,6 @@@ F:   tools/testing/selftests/filesystems/
  
  VFIO DRIVER
  M:    Alex Williamson <[email protected]>
 -R:    Cornelia Huck <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git https://github.com/awilliam/linux-vfio.git
@@@ -22056,7 -22004,6 +22056,7 @@@ S:   Maintaine
  F:    Documentation/ABI/testing/sysfs-bus-vdpa
  F:    Documentation/ABI/testing/sysfs-class-vduse
  F:    Documentation/devicetree/bindings/virtio/
 +F:    Documentation/driver-api/virtio/
  F:    drivers/block/virtio_blk.c
  F:    drivers/crypto/virtio/
  F:    drivers/net/virtio_net.c
@@@ -22077,10 -22024,6 +22077,10 @@@ IFCVF VIRTIO DATA PATH ACCELERATO
  R:    Zhu Lingshan <[email protected]>
  F:    drivers/vdpa/ifcvf/
  
 +SNET DPU VIRTIO DATA PATH ACCELERATOR
 +R:    Alvaro Karsz <[email protected]>
 +F:    drivers/vdpa/solidrun/
 +
  VIRTIO BALLOON
  M:    "Michael S. Tsirkin" <[email protected]>
  M:    David Hildenbrand <[email protected]>
@@@ -22303,9 -22246,7 +22303,9 @@@ F:   drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
 -M:    Vivek Thampi <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +M:    Deep Shah <[email protected]>
 +R:    Alexey Makhalov <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -22673,7 -22614,6 +22673,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
 +F:    include/linux/platform_data/x86/
  
  X86 PLATFORM DRIVERS - ARCH
  R:    Darren Hart <[email protected]>
@@@ -22950,17 -22890,6 +22950,17 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
 +XILINX XDMA DRIVER
 +M:    Lizhi Hou <[email protected]>
 +M:    Brian Xu <[email protected]>
 +M:    Raj Kumar Rampelli <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/dma/xilinx/xdma-regs.h
 +F:    drivers/dma/xilinx/xdma.c
 +F:    include/linux/dma/amd_xdma.h
 +F:    include/linux/platform_data/amd_xdma.h
 +
  XILINX ZYNQMP DPDMA DRIVER
  M:    Hyun Kwon <[email protected]>
  M:    Laurent Pinchart <[email protected]>
@@@ -22970,13 -22899,6 +22970,13 @@@ F: Documentation/devicetree/bindings/dm
  F:    drivers/dma/xilinx/xilinx_dpdma.c
  F:    include/dt-bindings/dma/xlnx-zynqmp-dpdma.h
  
 +XILINX ZYNQMP OCM EDAC DRIVER
 +M:    Shubhrajyoti Datta <[email protected]>
 +M:    Sai Krishna Potthuri <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml
 +F:    drivers/edac/zynqmp_edac.c
 +
  XILINX ZYNQMP PSGTR PHY DRIVER
  M:    Anurag Kumar Vulisha <[email protected]>
  M:    Laurent Pinchart <[email protected]>

diff --combined drivers/mtd/nand/raw/Kconfig
index 048b1c8f08ee6ffc52e2fb8f47b2bc2eca9a2be6,75a4452004348912deba637dc5f4bff6bf9d6eba..170f1185ddc4684ea698ebdab80de9397a00e36f
--- 1/drivers/mtd/nand/raw/Kconfig
--- 2/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@@ -79,7 -79,7 +79,7 @@@ config MTD_NAND_NDF
  
  config MTD_NAND_S3C2410
        tristate "Samsung S3C NAND controller"
 -      depends on ARCH_S3C24XX || ARCH_S3C64XX
 +      depends on ARCH_S3C64XX
        help
          This enables the NAND flash controller on the S3C24xx and S3C64xx
          SoCs
@@@ -193,13 -193,6 +193,6 @@@ config MTD_NAND_PASEM
          Enables support for NAND Flash interface on PA Semi PWRficient
          based boards
  
- config MTD_NAND_TMIO
-       tristate "Toshiba Mobile IO NAND controller"
-       depends on MFD_TMIO
-       help
-         Support for NAND flash connected to a Toshiba Mobile IO
-         Controller in some PDAs, including the Sharp SL6000x.
- 
  source "drivers/mtd/nand/raw/brcmnand/Kconfig"
  
  config MTD_NAND_BCM47XXNFLASH