Merge tag 'vfio-v6.5-rc1' of https://github.com/awilliam/linux-vfio

author Linus Torvalds <[email protected]>

Fri, 30 Jun 2023 22:22:09 +0000 (15:22 -0700)

committer Linus Torvalds <[email protected]>

Fri, 30 Jun 2023 22:22:09 +0000 (15:22 -0700)
author Linus Torvalds <[email protected]>
Fri, 30 Jun 2023 22:22:09 +0000 (15:22 -0700)
committer Linus Torvalds <[email protected]>
Fri, 30 Jun 2023 22:22:09 +0000 (15:22 -0700)
diff --combined MAINTAINERS

index d2326e8437487e0016410793a58781722e860c6d,ce6ac552d8f6d75a5b690e18e0643e79dfe70b49..910a3bd814b73ed54a543c4484f031f0f9783ac8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -406,13 -406,6 +406,13 @@@ L:       [email protected]
   S:    Maintained
   F:    drivers/acpi/arm64
   
+ +ACPI FOR RISC-V (ACPI/riscv)
+ +M:    Sunil V L <[email protected]>
+ +L:    [email protected]
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/acpi/riscv/
+ +
   ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
   M:    Sudeep Holla <[email protected]>
   L:    [email protected]
@@@ -456,8 -449,6 +456,8 @@@ F: include/linux/acpi_viot.
   ACPI WMI DRIVER
   L:    [email protected]
   S:    Orphan
+ +F:    Documentation/driver-api/wmi.rst
+ +F:    Documentation/wmi/
   F:    drivers/platform/x86/wmi.c
   F:    include/uapi/linux/wmi.h
   
@@@ -918,6 -909,13 +918,6 @@@ L:        [email protected]
   S:    Maintained
   F:    drivers/net/ethernet/altera/
   
- -ALTERA TSE PCS
- -M:    Maxime Chevallier <[email protected]>
- -L:    [email protected]
- -S:    Supported
- -F:    drivers/net/pcs/pcs-altera-tse.c
- -F:    include/linux/pcs-altera-tse.h
- -
   ALTERA UART/JTAG UART SERIAL DRIVERS
   M:    Tobias Klauser <[email protected]>
   L:    [email protected]
@@@ -958,8 -956,7 +958,8 @@@ F: Documentation/networking/device_driv
   F:    drivers/net/ethernet/amazon/
   
   AMAZON RDMA EFA DRIVER
- -M:    Gal Pressman <[email protected]>
+ +M:    Michael Margolin <[email protected]>
+ +R:    Gal Pressman <[email protected]>
   R:    Yossi Leybovich <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -1603,7 -1600,7 +1603,7 @@@ F:      drivers/media/i2c/ar0521.
   
   ARASAN NAND CONTROLLER DRIVER
   M:    Miquel Raynal <[email protected]>
- -M:    Naga Sureshkumar Relli <nagasure@xilinx.com>
+ +R:    Michal Simek <michal.simek@amd.com>
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml
@@@ -1636,7 -1633,6 +1636,7 @@@ L:      [email protected]
   S:    Maintained
   C:    irc://irc.libera.chat/armlinux
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
+ +F:    Documentation/process/maintainer-soc.rst
   F:    arch/arm/boot/dts/Makefile
   F:    arch/arm64/boot/dts/Makefile
   
@@@ -1668,9 -1664,9 +1668,9 @@@ F:      Documentation/devicetree/bindings/cl
   F:    Documentation/devicetree/bindings/i2c/arm,i2c-versatile.yaml
   F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
   F:    Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
- -F:    arch/arm/boot/dts/arm-realview-*
- -F:    arch/arm/boot/dts/integrator*
- -F:    arch/arm/boot/dts/versatile*
+ +F:    arch/arm/boot/dts/arm/arm-realview-*
+ +F:    arch/arm/boot/dts/arm/integrator*
+ +F:    arch/arm/boot/dts/arm/versatile*
   F:    arch/arm/mach-versatile/
   F:    drivers/bus/arm-integrator-lm.c
   F:    drivers/clk/versatile/
@@@ -1767,7 -1763,7 +1767,7 @@@ F:      include/linux/amba/mmci.
   
   ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
   M:    Miquel Raynal <[email protected]>
- -M:    Naga Sureshkumar Relli <nagasure@xilinx.com>
+ +R:    Michal Simek <michal.simek@amd.com>
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
@@@ -1775,7 -1771,7 +1775,7 @@@ F:      drivers/mtd/nand/raw/pl35x-nand-cont
   
   ARM PRIMECELL PL35X SMC DRIVER
   M:    Miquel Raynal <[email protected]>
- -M:    Naga Sureshkumar Relli <nagasure@xilinx.com>
+ +R:    Michal Simek <michal.simek@amd.com>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   F:    Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
@@@ -1841,7 -1837,7 +1841,7 @@@ F:      Documentation/devicetree/bindings/ne
   F:    Documentation/devicetree/bindings/pinctrl/actions,*
   F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
   F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
- -F:    arch/arm/boot/dts/owl-*
+ +F:    arch/arm/boot/dts/actions/
   F:    arch/arm/mach-actions/
   F:    arch/arm64/boot/dts/actions/
   F:    drivers/clk/actions/
@@@ -1887,7 -1883,6 +1887,7 @@@ L:      [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/clock/amlogic*
   F:    drivers/clk/meson/
+ +F:    include/dt-bindings/clock/amlogic,a1*
   F:    include/dt-bindings/clock/gxbb*
   F:    include/dt-bindings/clock/meson*
   
@@@ -1915,12 -1910,10 +1915,12 @@@ L:   [email protected]
   L:    [email protected]
   S:    Maintained
   W:    http://linux-meson.com/
- -F:    arch/arm/boot/dts/meson*
+ +F:    Documentation/devicetree/bindings/phy/amlogic*
+ +F:    arch/arm/boot/dts/amlogic/
   F:    arch/arm/mach-meson/
   F:    arch/arm64/boot/dts/amlogic/
   F:    drivers/mmc/host/meson*
+ +F:    drivers/phy/amlogic/
   F:    drivers/pinctrl/meson/
   F:    drivers/rtc/rtc-meson*
   F:    drivers/soc/amlogic/
@@@ -1931,7 -1924,7 +1931,7 @@@ M:      Tsahee Zidenberg <tsahee@annapurnala
   M:    Antoine Tenart <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/alpine*
+ +F:    arch/arm/boot/dts/amazon/
   F:    arch/arm/mach-alpine/
   F:    arch/arm64/boot/dts/amazon/
   F:    drivers/*/*alpine*
@@@ -2002,7 -1995,7 +2002,7 @@@ M:      Lars Persson <[email protected]
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
- -F:    arch/arm/boot/dts/artpec6*
+ +F:    arch/arm/boot/dts/axis/
   F:    arch/arm/mach-artpec
   F:    drivers/clk/axis
   F:    drivers/crypto/axis
@@@ -2030,7 -2023,7 +2030,7 @@@ S:      Supporte
   Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
   F:    Documentation/devicetree/bindings/arm/aspeed/
- -F:    arch/arm/boot/dts/aspeed-*
+ +F:    arch/arm/boot/dts/aspeed/
   F:    arch/arm/mach-aspeed/
   N:    aspeed
   
@@@ -2049,7 -2042,8 +2049,7 @@@ ARM/CALXEDA HIGHBANK ARCHITECTUR
   M:    Andre Przywara <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/ecx-*.dts*
- -F:    arch/arm/boot/dts/highbank.dts
+ +F:    arch/arm/boot/dts/calxeda/
   F:    arch/arm/mach-highbank/
   
   ARM/CAVIUM THUNDER NETWORK DRIVER
@@@ -2097,7 -2091,7 +2097,7 @@@ ARM/CONEXANT DIGICOLOR MACHINE SUPPOR
   M:    Baruch Siach <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/cx92755*
+ +F:    arch/arm/boot/dts/cnxt/
   N:    digicolor
   
   ARM/CORESIGHT FRAMEWORK AND DRIVERS
@@@ -2136,7 -2130,7 +2136,7 @@@ F:      Documentation/devicetree/bindings/ar
   F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.yaml
   F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
   F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
- -F:    arch/arm/boot/dts/gemini*
+ +F:    arch/arm/boot/dts/gemini/
   F:    arch/arm/mach-gemini/
   F:    drivers/crypto/gemini/
   F:    drivers/net/ethernet/cortina/
@@@ -2189,8 -2183,7 +2189,8 @@@ R:      NXP Linux Team <[email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
- -F:    arch/arm64/boot/dts/freescale/
+ +F:    arch/arm/boot/dts/nxp/imx/
+ +F:    arch/arm/boot/dts/nxp/mxs/
   X:    arch/arm64/boot/dts/freescale/fsl-*
   X:    arch/arm64/boot/dts/freescale/qoriq-*
   X:    drivers/media/i2c/
@@@ -2203,7 -2196,7 +2203,7 @@@ M:      Li Yang <[email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
- -F:    arch/arm/boot/dts/ls1021a*
+ +F:    arch/arm/boot/dts/nxp/ls/
   F:    arch/arm64/boot/dts/freescale/fsl-*
   F:    arch/arm64/boot/dts/freescale/qoriq-*
   
@@@ -2215,7 -2208,7 +2215,7 @@@ R:      Stefan Agner <[email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
- -F:    arch/arm/boot/dts/vf*
+ +F:    arch/arm/boot/dts/nxp/vf/
   F:    arch/arm/mach-imx/*vf610*
   
   ARM/GUMSTIX MACHINE SUPPORT
@@@ -2229,7 -2222,9 +2229,7 @@@ L:      [email protected]
   S:    Supported
   W:    http://www.hisilicon.com
   T:    git https://github.com/hisilicon/linux-hisi.git
- -F:    arch/arm/boot/dts/hi3*
- -F:    arch/arm/boot/dts/hip*
- -F:    arch/arm/boot/dts/hisi*
+ +F:    arch/arm/boot/dts/hisilicon/
   F:    arch/arm/mach-hisi/
   F:    arch/arm64/boot/dts/hisilicon/
   
@@@ -2251,7 -2246,8 +2251,7 @@@ F:      Documentation/devicetree/bindings/i2
   F:    Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
   F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
   F:    Documentation/hwmon/gxp-fan-ctrl.rst
- -F:    arch/arm/boot/dts/hpe-bmc*
- -F:    arch/arm/boot/dts/hpe-gxp*
+ +F:    arch/arm/boot/dts/hpe/
   F:    arch/arm/mach-hpe/
   F:    drivers/clocksource/timer-gxp.c
   F:    drivers/hwmon/gxp-fan-ctrl.c
@@@ -2265,7 -2261,7 +2265,7 @@@ M:      Javier Martinez Canillas <javier@dow
   L:    [email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/omap3-igep*
+ +F:    arch/arm/boot/dts/ti/omap/omap3-igep*
   
   ARM/INTEL IXP4XX ARM ARCHITECTURE
   M:    Linus Walleij <[email protected]>
@@@ -2278,7 -2274,7 +2278,7 @@@ F:      Documentation/devicetree/bindings/gp
   F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
   F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
   F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
- -F:    arch/arm/boot/dts/intel-ixp*
+ +F:    arch/arm/boot/dts/intel/ixp/
   F:    arch/arm/mach-ixp4xx/
   F:    drivers/bus/intel-ixp4xx-eb.c
   F:    drivers/clocksource/timer-ixp4xx.c
@@@ -2310,7 -2306,7 +2310,7 @@@ M:      Vladimir Zapolskiy <[email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   F:    Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
- -F:    arch/arm/boot/dts/lpc43*
+ +F:    arch/arm/boot/dts/nxp/lpc/lpc43*
   F:    drivers/i2c/busses/i2c-lpc2k.c
   F:    drivers/memory/pl172.c
   F:    drivers/mtd/spi-nor/controllers/nxp-spifi.c
@@@ -2323,7 -2319,7 +2323,7 @@@ L:      [email protected]
   S:    Maintained
   T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
   F:    Documentation/devicetree/bindings/i2c/i2c-pnx.txt
- -F:    arch/arm/boot/dts/lpc32*
+ +F:    arch/arm/boot/dts/nxp/lpc/lpc32*
   F:    arch/arm/mach-lpc32xx/
   F:    drivers/i2c/busses/i2c-pnx.c
   F:    drivers/net/ethernet/nxp/lpc_eth.c
@@@ -2341,8 -2337,8 +2341,8 @@@ T:      git git://git.kernel.org/pub/scm/lin
   F:    Documentation/devicetree/bindings/arm/marvell/marvell,dove.txt
   F:    Documentation/devicetree/bindings/arm/marvell/marvell,orion5x.txt
   F:    Documentation/devicetree/bindings/soc/dove/
- -F:    arch/arm/boot/dts/dove*
- -F:    arch/arm/boot/dts/orion5x*
+ +F:    arch/arm/boot/dts/marvell/dove*
+ +F:    arch/arm/boot/dts/marvell/orion5x*
   F:    arch/arm/mach-dove/
   F:    arch/arm/mach-mv78xx0/
   F:    arch/arm/mach-orion5x/
@@@ -2357,13 -2353,12 +2357,13 @@@ L:   [email protected]
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
   F:    Documentation/devicetree/bindings/arm/marvell/
- -F:    arch/arm/boot/dts/armada*
- -F:    arch/arm/boot/dts/kirkwood*
+ +F:    arch/arm/boot/dts/marvell/armada*
+ +F:    arch/arm/boot/dts/marvell/kirkwood*
   F:    arch/arm/configs/mvebu_*_defconfig
   F:    arch/arm/mach-mvebu/
   F:    arch/arm64/boot/dts/marvell/armada*
   F:    arch/arm64/boot/dts/marvell/cn913*
+ +F:    drivers/clk/mvebu/
   F:    drivers/cpufreq/armada-37xx-cpufreq.c
   F:    drivers/cpufreq/armada-8k-cpufreq.c
   F:    drivers/cpufreq/mvebu-cpufreq.c
@@@ -2393,7 -2388,10 +2393,7 @@@ L:     [email protected] (
   S:    Maintained
   W:    https://mtk.wiki.kernel.org/
   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*
+ +F:    arch/arm/boot/dts/mediatek/
   F:    arch/arm/mach-mediatek/
   F:    arch/arm64/boot/dts/mediatek/
   F:    drivers/soc/mediatek/
@@@ -2417,8 -2415,10 +2417,8 @@@ L:     [email protected]
   S:    Supported
   W:    http://www.linux4sam.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
- -F:    arch/arm/boot/dts/at91*.dts
- -F:    arch/arm/boot/dts/at91*.dtsi
- -F:    arch/arm/boot/dts/sama*.dts
- -F:    arch/arm/boot/dts/sama*.dtsi
+ +F:    arch/arm/boot/dts/microchip/at91*
+ +F:    arch/arm/boot/dts/microchip/sama*
   F:    arch/arm/include/debug/at91.S
   F:    arch/arm/mach-at91/
   F:    drivers/memory/atmel*
@@@ -2429,15 -2429,6 +2429,15 @@@ X:    drivers/net/wireless/atmel
   N:    at91
   N:    atmel
   
+ +ARM/MICROCHIP (ARM64) SoC support
+ +M:    Conor Dooley <[email protected]>
+ +M:    Nicolas Ferre <[email protected]>
+ +M:    Claudiu Beznea <[email protected]>
+ +L:    [email protected] (moderated for non-subscribers)
+ +S:    Supported
+ +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
+ +F:    arch/arm64/boot/dts/microchip/
+ +
   ARM/Microchip Sparx5 SoC support
   M:    Lars Povlsen <[email protected]>
   M:    Steen Hegelund <[email protected]>
@@@ -2445,7 -2436,8 +2445,7 @@@ M:      Daniel Machon <daniel.machon@microch
   M:    [email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Supported
- -T:    git git://github.com/microchip-ung/linux-upstream.git
- -F:    arch/arm64/boot/dts/microchip/
+ +F:    arch/arm64/boot/dts/microchip/sparx*
   F:    drivers/net/ethernet/microchip/vcap/
   F:    drivers/pinctrl/pinctrl-microchip-sgpio.c
   N:    sparx5
@@@ -2455,7 -2447,7 +2455,7 @@@ M:      Taichi Sugaya <sugaya.taichi@socione
   M:    Takao Orito <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/milbeaut*
+ +F:    arch/arm/boot/dts/socionext/milbeaut*
   F:    arch/arm/mach-milbeaut/
   N:    milbeaut
   
@@@ -2469,7 -2461,7 +2469,7 @@@ T:      git git://github.com/linux-chenxing/
   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/boot/dts/sigmastar/
   F:    arch/arm/mach-mstar/
   F:    drivers/clk/mstar/
   F:    drivers/clocksource/timer-msc313e.c
@@@ -2488,7 -2480,7 +2488,7 @@@ F:      Documentation/devicetree/bindings/ar
   F:    Documentation/devicetree/bindings/arm/ux500.yaml
   F:    Documentation/devicetree/bindings/arm/ux500/
   F:    Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml
- -F:    arch/arm/boot/dts/ste-*
+ +F:    arch/arm/boot/dts/st/ste-*
   F:    arch/arm/mach-nomadik/
   F:    arch/arm/mach-ux500/
   F:    drivers/clk/clk-nomadik.c
@@@ -2505,18 -2497,6 +2505,18 @@@ F:    drivers/rtc/rtc-ab8500.
   F:    drivers/rtc/rtc-pl031.c
   F:    drivers/soc/ux500/
   
+ +ARM/NUVOTON MA35 ARCHITECTURE
+ +M:    Jacky Huang <[email protected]>
+ +M:    Shan-Chun Hung <[email protected]>
+ +L:    [email protected] (moderated for non-subscribers)
+ +S:    Supported
+ +F:    Documentation/devicetree/bindings/*/*/*ma35*
+ +F:    Documentation/devicetree/bindings/*/*ma35*
+ +F:    arch/arm64/boot/dts/nuvoton/*ma35*
+ +F:    drivers/*/*/*ma35*
+ +F:    drivers/*/*ma35*
+ +K:    ma35d1
+ +
   ARM/NUVOTON NPCM ARCHITECTURE
   M:    Avi Fishman <[email protected]>
   M:    Tomer Maimon <[email protected]>
@@@ -2528,8 -2508,9 +2528,8 @@@ L:      [email protected] (moderated 
   S:    Supported
   F:    Documentation/devicetree/bindings/*/*/*npcm*
   F:    Documentation/devicetree/bindings/*/*npcm*
- -F:    Documentation/devicetree/bindings/arm/npcm/*
   F:    Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
- -F:    arch/arm/boot/dts/nuvoton-npcm*
+ +F:    arch/arm/boot/dts/nuvoton/nuvoton-npcm*
   F:    arch/arm/mach-npcm/
   F:    arch/arm64/boot/dts/nuvoton/
   F:    drivers/*/*/*npcm*
@@@ -2544,7 -2525,7 +2544,7 @@@ L:      [email protected] (moderated 
   S:    Maintained
   W:    https://github.com/neuschaefer/wpcm450/wiki
   F:    Documentation/devicetree/bindings/*/*wpcm*
- -F:    arch/arm/boot/dts/nuvoton-wpcm450*
+ +F:    arch/arm/boot/dts/nuvoton/nuvoton-wpcm450*
   F:    arch/arm/configs/wpcm450_defconfig
   F:    arch/arm/mach-npcm/wpcm450.c
   F:    drivers/*/*/*wpcm*
@@@ -2585,19 -2566,20 +2585,19 @@@ F:   arch/arm64/boot/dts/qcom/sdm845-chez
   ARM/QUALCOMM SUPPORT
   M:    Andy Gross <[email protected]>
   M:    Bjorn Andersson <[email protected]>
- -R:    Konrad Dybcio <[email protected]>
+ +M:    Konrad Dybcio <[email protected]>
   L:    [email protected]
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
   F:    Documentation/devicetree/bindings/*/qcom*
   F:    Documentation/devicetree/bindings/soc/qcom/
- -F:    arch/arm/boot/dts/qcom-*.dts
- -F:    arch/arm/boot/dts/qcom-*.dtsi
+ +F:    arch/arm/boot/dts/qcom/
   F:    arch/arm/configs/qcom_defconfig
   F:    arch/arm/mach-qcom/
   F:    arch/arm64/boot/dts/qcom/
+ +F:    drivers/*/*/pm8???-*
   F:    drivers/*/*/qcom*
   F:    drivers/*/*/qcom/
- -F:    drivers/*/pm8???-*
   F:    drivers/*/qcom*
   F:    drivers/*/qcom/
   F:    drivers/bluetooth/btqcomsmd.c
@@@ -2634,7 -2616,7 +2634,7 @@@ F:      Documentation/devicetree/bindings/gp
   F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.yaml
   F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
   F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
- -F:    arch/arm/boot/dts/rda8810pl-*
+ +F:    arch/arm/boot/dts/unisoc/
   F:    drivers/clocksource/timer-rda.c
   F:    drivers/gpio/gpio-rda.c
   F:    drivers/irqchip/irq-rda-intc.c
@@@ -2646,7 -2628,7 +2646,7 @@@ L:      [email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   F:    Documentation/devicetree/bindings/arm/realtek.yaml
- -F:    arch/arm/boot/dts/rtd*
+ +F:    arch/arm/boot/dts/realtek/
   F:    arch/arm/mach-realtek/
   F:    arch/arm64/boot/dts/realtek/
   
@@@ -2660,7 -2642,13 +2660,7 @@@ C:     irc://irc.libera.chat/renesas-so
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
   F:    Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
   F:    Documentation/devicetree/bindings/soc/renesas/
- -F:    arch/arm/boot/dts/emev2*
- -F:    arch/arm/boot/dts/gr-peach*
- -F:    arch/arm/boot/dts/iwg20d-q7*
- -F:    arch/arm/boot/dts/r7s*
- -F:    arch/arm/boot/dts/r8a*
- -F:    arch/arm/boot/dts/r9a*
- -F:    arch/arm/boot/dts/sh*
+ +F:    arch/arm/boot/dts/renesas/
   F:    arch/arm/configs/shmobile_defconfig
   F:    arch/arm/include/debug/renesas-scif.S
   F:    arch/arm/mach-shmobile/
@@@ -2693,7 -2681,8 +2693,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
   F:    Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
   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/rv11*
+ +F:    arch/arm/boot/dts/rockchip/
   F:    arch/arm/mach-rockchip/
   F:    drivers/*/*/*rockchip*
   F:    drivers/*/*rockchip*
@@@ -2712,12 -2701,14 +2712,12 @@@ Q:   https://patchwork.kernel.org/project
   B:    mailto:[email protected]
   C:    irc://irc.libera.chat/linux-exynos
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
- -F:    Documentation/arm/samsung/
+ +F:    Documentation/arch/arm/samsung/
   F:    Documentation/devicetree/bindings/arm/samsung/
   F:    Documentation/devicetree/bindings/hwinfo/samsung,*
   F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
   F:    Documentation/devicetree/bindings/soc/samsung/
- -F:    arch/arm/boot/dts/exynos*
- -F:    arch/arm/boot/dts/s3c*
- -F:    arch/arm/boot/dts/s5p*
+ +F:    arch/arm/boot/dts/samsung/
   F:    arch/arm/mach-exynos*/
   F:    arch/arm/mach-s3c/
   F:    arch/arm/mach-s5p*/
@@@ -2777,7 -2768,7 +2777,7 @@@ M:      Dinh Nguyen <[email protected]
   S:    Maintained
   W:    http://www.rocketboards.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
- -F:    arch/arm/boot/dts/socfpga*
+ +F:    arch/arm/boot/dts/intel/socfpga/
   F:    arch/arm/configs/socfpga_defconfig
   F:    arch/arm/mach-socfpga/
   F:    arch/arm64/boot/dts/altera/
@@@ -2810,7 -2801,7 +2810,7 @@@ S:      Maintaine
   W:    http://www.stlinux.com
   F:    Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml
   F:    Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
- -F:    arch/arm/boot/dts/sti*
+ +F:    arch/arm/boot/dts/st/sti*
   F:    arch/arm/mach-sti/
   F:    drivers/ata/ahci_st.c
   F:    drivers/char/hw_random/st-rng.c
@@@ -2843,10 -2834,9 +2843,10 @@@ L:    [email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
- -F:    arch/arm/boot/dts/stm32*
+ +F:    arch/arm/boot/dts/st/stm32*
   F:    arch/arm/mach-stm32/
   F:    drivers/clocksource/armv7m_systick.c
+ +F:    arch/arm64/boot/dts/st/
   N:    stm32
   N:    stm
   
@@@ -2859,7 -2849,7 +2859,7 @@@ F:      Documentation/devicetree/bindings/ar
   F:    Documentation/devicetree/bindings/clock/sunplus,sp7021-clkc.yaml
   F:    Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.yaml
   F:    Documentation/devicetree/bindings/reset/sunplus,reset.yaml
- -F:    arch/arm/boot/dts/sunplus-sp7021*.dts*
+ +F:    arch/arm/boot/dts/sunplus/
   F:    arch/arm/configs/sp7021_*defconfig
   F:    arch/arm/mach-sunplus/
   F:    drivers/clk/clk-sp7021.c
@@@ -2873,7 -2863,7 +2873,7 @@@ M:      Jisheng Zhang <[email protected]
   M:    Sebastian Hesselbarth <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/berlin*
+ +F:    arch/arm/boot/dts/synaptics/
   F:    arch/arm/mach-berlin/
   F:    arch/arm64/boot/dts/synaptics/
   
@@@ -2915,7 -2905,7 +2915,7 @@@ M:      Santosh Shilimkar <[email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
- -F:    arch/arm/boot/dts/keystone-*
+ +F:    arch/arm/boot/dts/ti/keystone/
   F:    arch/arm/mach-keystone/
   
   ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@ -2947,6 -2937,7 +2947,6 @@@ F:      Documentation/devicetree/bindings/ar
   F:    Documentation/devicetree/bindings/hwinfo/ti,k3-socinfo.yaml
   F:    arch/arm64/boot/dts/ti/Makefile
   F:    arch/arm64/boot/dts/ti/k3-*
- -F:    include/dt-bindings/pinctrl/k3.h
   
   ARM/TOSHIBA VISCONTI ARCHITECTURE
   M:    Nobuhiro Iwamatsu <[email protected]>
@@@ -2979,7 -2970,7 +2979,7 @@@ F:      Documentation/devicetree/bindings/ar
   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/boot/dts/socionext/uniphier*
   F:    arch/arm/include/asm/hardware/cache-uniphier.h
   F:    arch/arm/mach-uniphier/
   F:    arch/arm/mm/cache-uniphier.c
@@@ -3004,7 -2995,7 +3004,7 @@@ L:      [email protected]
   S:    Maintained
   F:    */*/*/vexpress*
   F:    */*/vexpress*
- -F:    arch/arm/boot/dts/vexpress*
+ +F:    arch/arm/boot/dts/arm/vexpress*
   F:    arch/arm/mach-versatile/
   F:    arch/arm64/boot/dts/arm/
   F:    drivers/clk/versatile/clk-vexpress-osc.c
@@@ -3062,7 -3053,7 +3062,7 @@@ M:      Will Deacon <[email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
- -F:    Documentation/arm64/
+ +F:    Documentation/arch/arm64/
   F:    arch/arm64/
   F:    tools/testing/selftests/arm64/
   X:    arch/arm64/boot/dts/
@@@ -3411,10 -3402,10 +3411,10 @@@ AXENTIA ARM DEVICE
   M:    Peter Rosin <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/at91-linea.dtsi
- -F:    arch/arm/boot/dts/at91-natte.dtsi
- -F:    arch/arm/boot/dts/at91-nattis-2-natte-2.dts
- -F:    arch/arm/boot/dts/at91-tse850-3.dts
+ +F:    arch/arm/boot/dts/microchip/at91-linea.dtsi
+ +F:    arch/arm/boot/dts/microchip/at91-natte.dtsi
+ +F:    arch/arm/boot/dts/microchip/at91-nattis-2-natte-2.dts
+ +F:    arch/arm/boot/dts/microchip/at91-tse850-3.dts
   
   AXENTIA ASOC DRIVERS
   M:    Peter Rosin <[email protected]>
@@@ -3545,7 -3536,7 +3545,7 @@@ F:      Documentation/filesystems/befs.rs
   F:    fs/befs/
   
   BFQ I/O SCHEDULER
- -M:    Paolo Valente <paolo.valente@linaro.org>
+ +M:    Paolo Valente <paolo.valente@unimore.it>
   M:    Jens Axboe <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -3613,7 -3604,6 +3613,7 @@@ S:      Supporte
   W:    http://www.bluez.org/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
+ +F:    Documentation/devicetree/bindings/net/bluetooth/
   F:    drivers/bluetooth/
   
   BLUETOOTH SUBSYSTEM
@@@ -3901,7 -3891,7 +3901,7 @@@ S:      Supporte
   F:    drivers/net/ethernet/broadcom/b44.*
   
   BROADCOM B53/SF2 ETHERNET SWITCH DRIVER
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   L:    [email protected]
   L:    [email protected] (subscribers-only)
   S:    Supported
@@@ -3912,7 -3902,7 +3912,7 @@@ F:      include/linux/dsa/brcm.
   F:    include/linux/platform_data/b53.h
   
   BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   L:    [email protected] (moderated for non-subscribers)
@@@ -3926,7 -3916,7 +3926,7 @@@ N:      bcm283
   N:    raspberrypi
   
   BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   M:    Ray Jui <[email protected]>
   M:    Scott Branden <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
@@@ -3965,26 -3955,25 +3965,26 @@@ F:   Documentation/devicetree/bindings/pi
   F:    drivers/pinctrl/bcm/pinctrl-bcm4908.c
   
   BROADCOM BCM5301X ARM ARCHITECTURE
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   M:    Hauke Mehrtens <[email protected]>
   M:    Rafał Miłecki <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/bcm470*
- -F:    arch/arm/boot/dts/bcm5301*
- -F:    arch/arm/boot/dts/bcm953012*
+ +F:    arch/arm/boot/dts/broadcom/bcm-ns.dtsi
+ +F:    arch/arm/boot/dts/broadcom/bcm470*
+ +F:    arch/arm/boot/dts/broadcom/bcm5301*
+ +F:    arch/arm/boot/dts/broadcom/bcm953012*
   F:    arch/arm/mach-bcm/bcm_5301x.c
   
   BROADCOM BCM53573 ARM ARCHITECTURE
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   M:    Rafał Miłecki <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    arch/arm/boot/dts/bcm47189*
- -F:    arch/arm/boot/dts/bcm53573*
+ +F:    arch/arm/boot/dts/broadcom/bcm47189*
+ +F:    arch/arm/boot/dts/broadcom/bcm53573*
   
   BROADCOM BCM63XX/BCM33XX UDC DRIVER
   M:    Kevin Cernekee <[email protected]>
@@@ -3993,13 -3982,13 +3993,13 @@@ S:   Maintaine
   F:    drivers/usb/gadget/udc/bcm63xx_udc.*
   
   BROADCOM BCM7XXX ARM ARCHITECTURE
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   T:    git https://github.com/broadcom/stblinux.git
   F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
- -F:    arch/arm/boot/dts/bcm7*.dts*
+ +F:    arch/arm/boot/dts/broadcom/bcm7*.dts*
   F:    arch/arm/include/asm/hardware/cache-b15-rac.h
   F:    arch/arm/mach-bcm/*brcmstb*
   F:    arch/arm/mm/cache-b15-rac.c
@@@ -4013,7 -4002,7 +4013,7 @@@ BROADCOM BCMBCA ARM ARCHITECTUR
   M:    William Zhang <[email protected]>
   M:    Anand Gore <[email protected]>
   M:    Kursad Oney <[email protected]>
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   M:    Rafał Miłecki <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
@@@ -4038,7 -4027,7 +4038,7 @@@ N:      bcm[9]?685
   N:    bcm[9]?6878
   
   BROADCOM BDC DRIVER
- -M:    Justin Chen <justinpopo6@gmail.com>
+ +M:    Justin Chen <justin.chen@broadcom.com>
   M:    Al Cooper <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
@@@ -4054,7 -4043,7 +4054,7 @@@ S:      Maintaine
   F:    drivers/cpufreq/bmips-cpufreq.c
   
   BROADCOM BMIPS MIPS ARCHITECTURE
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -4122,14 -4111,14 +4122,14 @@@ F:   drivers/net/wireless/broadcom/brcm80
   
   BROADCOM BRCMSTB GPIO DRIVER
   M:    Doug Berger <[email protected]>
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom>
   R:    Broadcom internal kernel review list <[email protected]>
   S:    Supported
   F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
   F:    drivers/gpio/gpio-brcmstb.c
   
   BROADCOM BRCMSTB I2C DRIVER
- -M:    Kamal Dasu <kdasu.kdev@gmail.com>
+ +M:    Kamal Dasu <kamal.dasu@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -4145,7 -4134,7 +4145,7 @@@ F:      Documentation/devicetree/bindings/se
   F:    drivers/tty/serial/8250/8250_bcm7271.c
   
   BROADCOM BRCMSTB USB EHCI DRIVER
- -M:    Justin Chen <justinpopo6@gmail.com>
+ +M:    Justin Chen <justin.chen@broadcom.com>
   M:    Al Cooper <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
@@@ -4162,7 -4151,7 +4162,7 @@@ F:      Documentation/devicetree/bindings/us
   F:    drivers/usb/misc/brcmstb-usb-pinmap.c
   
   BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
- -M:    Justin Chen <justinpopo6@gmail.com>
+ +M:    Justin Chen <justin.chen@broadcom.com>
   M:    Al Cooper <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
@@@ -4181,7 -4170,7 +4181,7 @@@ F:      drivers/spi/spi-bcm63xx-hsspi.
   F:    drivers/spi/spi-bcmbca-hsspi.c
   
   BROADCOM ETHERNET PHY DRIVERS
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -4192,7 -4181,7 +4192,7 @@@ F:      include/linux/brcmphy.
   
   BROADCOM GENET ETHERNET DRIVER
   M:    Doug Berger <[email protected]>
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -4276,7 -4265,7 +4276,7 @@@ F:      drivers/firmware/broadcom/
   
   BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
   M:    Rafał Miłecki <[email protected]>
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -4292,7 -4281,7 +4292,7 @@@ F:      drivers/bcma
   F:    include/linux/bcma/
   
   BROADCOM SPI DRIVER
- -M:    Kamal Dasu <kdasu.kdev@gmail.com>
+ +M:    Kamal Dasu <kamal.dasu@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   S:    Maintained
   F:    Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
@@@ -4326,7 -4315,7 +4326,7 @@@ F:      drivers/memory/brcmstb_dpfe.
   
   BROADCOM STB NAND FLASH DRIVER
   M:    Brian Norris <[email protected]>
- -M:    Kamal Dasu <kdasu.kdev@gmail.com>
+ +M:    Kamal Dasu <kamal.dasu@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -4336,7 -4325,7 +4336,7 @@@ F:      include/linux/platform_data/brcmnand
   BROADCOM STB PCIE DRIVER
   M:    Jim Quinlan <[email protected]>
   M:    Nicolas Saenz Julienne <[email protected]>
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -4344,7 -4333,7 +4344,7 @@@ F:      Documentation/devicetree/bindings/pc
   F:    drivers/pci/controller/pcie-brcmstb.c
   
   BROADCOM SYSTEMPORT ETHERNET DRIVER
- -M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Florian Fainelli <florian.fainelli@broadcom.com>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -4489,13 -4478,6 +4489,13 @@@ S:    Supporte
   F:    Documentation/filesystems/caching/cachefiles.rst
   F:    fs/cachefiles/
   
+ +CACHESTAT: PAGE CACHE STATS FOR A FILE
+ +M:    Nhat Pham <[email protected]>
+ +M:    Johannes Weiner <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    tools/testing/selftests/cachestat/test_cachestat.c
+ +
   CADENCE MIPI-CSI2 BRIDGES
   M:    Maxime Ripard <[email protected]>
   L:    [email protected]
@@@ -5148,7 -5130,7 +5148,7 @@@ X:      drivers/clk/clkdev.
   
   COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)
   M:    Steve French <[email protected]>
- -R:    Paulo Alcantara <pc@cjr.nz> (DFS, global name space)
+ +R:    Paulo Alcantara <pc@manguebit.com> (DFS, global name space)
   R:    Ronnie Sahlberg <[email protected]> (directory leases, sparse files)
   R:    Shyam Prasad N <[email protected]> (multichannel)
   R:    Tom Talpey <[email protected]> (RDMA, smbdirect)
@@@ -5158,8 -5140,8 +5158,8 @@@ S:      Supporte
   W:    https://wiki.samba.org/index.php/LinuxCIFS
   T:    git git://git.samba.org/sfrench/cifs-2.6.git
   F:    Documentation/admin-guide/cifs/
- -F:    fs/cifs/
- -F:    fs/smbfs_common/
+ +F:    fs/smb/client/
+ +F:    fs/smb/common/
   F:    include/uapi/linux/cifs
   
   COMPACTPCI HOTPLUG CORE
@@@ -5353,18 -5335,6 +5353,18 @@@ F:    include/linux/sched/cpufreq.
   F:    kernel/sched/cpufreq*.c
   F:    tools/testing/selftests/cpufreq/
   
+ +CPU HOTPLUG
+ +M:    Thomas Gleixner <[email protected]>
+ +M:    Peter Zijlstra <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git smp/core
+ +F:    kernel/cpu.c
+ +F:    kernel/smpboot.*
+ +F:    include/linux/cpu.h
+ +F:    include/linux/cpuhotplug.h
+ +F:    include/linux/smpboot.h
+ +
   CPU IDLE TIME MANAGEMENT FRAMEWORK
   M:    "Rafael J. Wysocki" <[email protected]>
   M:    Daniel Lezcano <[email protected]>
@@@ -5733,7 -5703,10 +5733,7 @@@ DC395x SCSI drive
   M:    Oliver Neukum <[email protected]>
   M:    Ali Akcaagac <[email protected]>
   M:    Jamie Lenehan <[email protected]>
- -L:    [email protected]
   S:    Maintained
- -W:    http://twibble.org/dist/dc395x/
- -W:    http://lists.twibble.org/mailman/listinfo/dc395x/
   F:    Documentation/scsi/dc395x.rst
   F:    drivers/scsi/dc395x.*
   
@@@ -5746,14 -5719,6 +5746,14 @@@ F:    include/linux/tfrc.
   F:    include/uapi/linux/dccp.h
   F:    net/dccp/
   
+ +DEBUGOBJECTS:
+ +M:    Thomas Gleixner <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/debugobjects
+ +F:    lib/debugobjects.c
+ +F:    include/linux/debugobjects.h
+ +
   DECSTATION PLATFORM SUPPORT
   M:    "Maciej W. Rozycki" <[email protected]>
   L:    [email protected]
@@@ -5843,7 -5808,6 +5843,7 @@@ M:      Armin Wolf <[email protected]
   S:    Maintained
   F:    Documentation/ABI/testing/debugfs-dell-wmi-ddv
   F:    Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv
+ +F:    Documentation/wmi/devices/dell-wmi-ddv.rst
   F:    drivers/platform/x86/dell/dell-wmi-ddv.c
   
   DELL WMI DESCRIPTOR DRIVER
@@@ -6025,15 -5989,15 +6025,15 @@@ DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD S
   M:    Christoph Niedermaier <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    arch/arm/boot/dts/imx6*-dhcom-*
- -F:    arch/arm/boot/dts/imx6*-dhcor-*
+ +F:    arch/arm/boot/dts/nxp/imx/imx6*-dhcom-*
+ +F:    arch/arm/boot/dts/nxp/imx/imx6*-dhcor-*
   
   DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
   M:    Marek Vasut <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    arch/arm/boot/dts/stm32mp1*-dhcom-*
- -F:    arch/arm/boot/dts/stm32mp1*-dhcor-*
+ +F:    arch/arm/boot/dts/st/stm32mp1*-dhcom-*
+ +F:    arch/arm/boot/dts/st/stm32mp1*-dhcor-*
   
   DIALOG SEMICONDUCTOR DRIVERS
   M:    Support Opensource <[email protected]>
@@@ -6246,12 -6210,6 +6246,12 @@@ X:    Documentation/power
   X:    Documentation/spi/
   X:    Documentation/userspace-api/media/
   
+ +DOCUMENTATION PROCESS
+ +M:    Jonathan Corbet <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/process/
+ +L:    [email protected]
+ +
   DOCUMENTATION REPORTING ISSUES
   M:    Thorsten Leemhuis <[email protected]>
   L:    [email protected]
@@@ -6608,7 -6566,6 +6608,7 @@@ M:      Rob Clark <[email protected]
   M:    Abhinav Kumar <[email protected]>
   M:    Dmitry Baryshkov <[email protected]>
   R:    Sean Paul <[email protected]>
+ +R:    Marijn Suijten <[email protected]>
   L:    [email protected]
   L:    [email protected]
   L:    [email protected]
@@@ -6729,12 -6686,6 +6729,12 @@@ S:    Maintaine
   F:    Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
   F:    drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
   
+ +DRM DRIVER FOR SAMSUNG S6D7AA0 PANELS
+ +M:    Artur Weber <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml
+ +F:    drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c
+ +
   DRM DRIVER FOR SITRONIX ST7586 PANELS
   M:    David Lechner <[email protected]>
   S:    Maintained
@@@ -6807,7 -6758,6 +6807,7 @@@ F:      drivers/gpu/drm/udl
   DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
   M:    Rodrigo Siqueira <[email protected]>
   M:    Melissa Wen <[email protected]>
+ +M:    Maíra Canal <[email protected]>
   R:    Haneen Mohammed <[email protected]>
   R:    Daniel Vetter <[email protected]>
   L:    [email protected]
@@@ -6910,7 -6860,6 +6910,7 @@@ S:      Maintaine
   T:    git git://anongit.freedesktop.org/drm/drm-misc
   F:    Documentation/devicetree/bindings/display/bridge/
   F:    drivers/gpu/drm/bridge/
+ +F:    drivers/gpu/drm/drm_bridge.c
   F:    include/drm/drm_bridge.h
   
   DRM DRIVERS FOR EXYNOS
@@@ -7019,7 -6968,8 +7019,7 @@@ F:      Documentation/devicetree/bindings/di
   F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
   F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
   F:    Documentation/devicetree/bindings/display/renesas,du.yaml
- -F:    drivers/gpu/drm/rcar-du/
- -F:    drivers/gpu/drm/shmobile/
+ +F:    drivers/gpu/drm/renesas/
   F:    include/linux/platform_data/shmob_drm.h
   
   DRM DRIVERS FOR ROCKCHIP
@@@ -7115,6 -7065,7 +7115,6 @@@ F:      Documentation/gpu/xen-front.rs
   F:    drivers/gpu/drm/xen/
   
   DRM DRIVERS FOR XILINX
- -M:    Hyun Kwon <[email protected]>
   M:    Laurent Pinchart <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -7514,14 -7465,6 +7514,14 @@@ L:    [email protected]
   S:    Maintained
   F:    drivers/edac/mpc85xx_edac.[ch]
   
+ +EDAC-NPCM
+ +M:    Marvin Lin <[email protected]>
+ +M:    Stanley Chu <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/memory-controllers/nuvoton,npcm-memory-controller.yaml
+ +F:    drivers/edac/npcm_edac.c
+ +
   EDAC-PASEMI
   M:    Egor Martovetsky <[email protected]>
   L:    [email protected]
@@@ -8018,12 -7961,6 +8018,12 @@@ S:    Maintaine
   F:    drivers/hwmon/f75375s.c
   F:    include/linux/f75375s.h
   
+ +FINTEK F81604 USB to 2xCANBUS DEVICE DRIVER
+ +M:    Ji-Ze Hong (Peter Hong) <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/net/can/usb/f81604.c
+ +
   FIREWIRE AUDIO DRIVERS and IEC 61883-1/6 PACKET STREAMING ENGINE
   M:    Clemens Ladisch <[email protected]>
   M:    Takashi Sakamoto <[email protected]>
@@@ -8119,7 -8056,6 +8119,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
   F:    include/linux/fortify-string.h
   F:    lib/fortify_kunit.c
   F:    lib/memcpy_kunit.c
+ +F:    lib/strcat_kunit.c
   F:    lib/strscpy_kunit.c
   F:    lib/test_fortify/*
   F:    scripts/test_fortify.sh
@@@ -8217,7 -8153,6 +8217,7 @@@ F:      include/linux/spi/spi-fsl-dspi.
   
   FREESCALE ENETC ETHERNET DRIVERS
   M:    Claudiu Manoil <[email protected]>
+ +M:    Vladimir Oltean <[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    drivers/net/ethernet/freescale/enetc/
@@@ -8718,9 -8653,6 +8718,9 @@@ F:      drivers/input/touchscreen/resistive-
   GENERIC STRING LIBRARY
   R:    Andy Shevchenko <[email protected]>
   S:    Maintained
+ +F:    include/linux/string.h
+ +F:    include/linux/string_choices.h
+ +F:    include/linux/string_helpers.h
   F:    lib/string.c
   F:    lib/string_helpers.c
   F:    lib/test-string_helpers.c
@@@ -8849,7 -8781,6 +8849,7 @@@ F:      include/linux/gpio/regmap.
   GPIO SUBSYSTEM
   M:    Linus Walleij <[email protected]>
   M:    Bartosz Golaszewski <[email protected]>
+ +R:    Andy Shevchenko <[email protected]>
   L:    [email protected]
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -9214,12 -9145,6 +9214,12 @@@ L:    [email protected]
   S:    Maintained
   F:    drivers/hid/hid-pxrc.c
   
+ +HID NVIDIA SHIELD DRIVER
+ +M:    Rahul Rameshbabu <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/hid/hid-nvidia-shield.c
+ +
   HID PLAYSTATION DRIVER
   M:    Roderick Colenbrander <[email protected]>
   L:    [email protected]
@@@ -9409,7 -9334,7 +9409,7 @@@ F:      include/linux/hisi_acc_qm.
   
   HISILICON ROCE DRIVER
   M:    Haoyue Xu <[email protected]>
- -M:    Wenpeng Liang <liangwenpeng@huawei.com>
+ +M:    Junxian Huang <huangjunxian6@hisilicon.com>
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
@@@ -9495,13 -9420,6 +9495,13 @@@ L:    [email protected]
   S:    Orphan
   F:    drivers/platform/x86/hp/tc1100-wmi.c
   
+ +HP WMI HARDWARE MONITOR DRIVER
+ +M:    James Seo <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    Documentation/hwmon/hp-wmi-sensors.rst
+ +F:    drivers/hwmon/hp-wmi-sensors.c
+ +
   HPET: High Precision Event Timers driver
   M:    Clemens Ladisch <[email protected]>
   S:    Maintained
@@@ -9759,9 -9677,8 +9759,9 @@@ F:      include/uapi/linux/i2c-*.
   F:    include/uapi/linux/i2c.h
   
   I2C SUBSYSTEM HOST DRIVERS
+ +M:    Andi Shyti <[email protected]>
   L:    [email protected]
- -S:    Odd Fixes
+ +S:    Maintained
   W:    https://i2c.wiki.kernel.org/
   Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
@@@ -10035,9 -9952,8 +10035,9 @@@ M:    Miquel Raynal <miquel.raynal@bootlin
   L:    [email protected]
   S:    Maintained
   W:    https://linux-wpan.org/
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git
+ +Q:    https://patchwork.kernel.org/project/linux-wpan/list/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git
   F:    Documentation/networking/ieee802154.rst
   F:    drivers/net/ieee802154/
   F:    include/linux/ieee802154.h
@@@ -10189,7 -10105,7 +10189,7 @@@ S:   Maintaine
   F:    Documentation/process/kernel-docs.rst
   
   INDUSTRY PACK SUBSYSTEM (IPACK)
- -M:    Samuel Iglesias Gonsalvez <siglesias@igalia.com>
+ +M:    Vaibhav Gupta <vaibhavgupta40@gmail.com>
   M:    Jens Taprogge <[email protected]>
   M:    Greg Kroah-Hartman <[email protected]>
   L:    [email protected]
@@@ -10409,8 -10325,9 +10409,8 @@@ M:   Jesse Brandeburg <jesse.brandeburg@i
   M:    Tony Nguyen <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Supported
- -W:    http://www.intel.com/support/feedback.htm
- -W:    http://e1000.sourceforge.net/
- -Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
+ +W:    https://www.intel.com/content/www/us/en/support.html
+ +Q:    https://patchwork.ozlabs.org/project/intel-wired-lan/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git
   F:    Documentation/networking/device_drivers/ethernet/intel/
@@@ -11337,10 -11254,6 +11337,10 @@@ W: http://kernelnewbies.org/KernelJanit
   KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
   M:    Chuck Lever <[email protected]>
   M:    Jeff Layton <[email protected]>
+ +R:    Neil Brown <[email protected]>
+ +R:    Olga Kornievskaia <[email protected]>
+ +R:    Dai Ngo <[email protected]>
+ +R:    Tom Talpey <[email protected]>
   L:    [email protected]
   S:    Supported
   W:    http://nfs.sourceforge.net/
@@@ -11387,9 -11300,9 +11387,9 @@@ R:   Tom Talpey <[email protected]
   L:    [email protected]
   S:    Maintained
   T:    git git://git.samba.org/ksmbd.git
- -F:    Documentation/filesystems/cifs/ksmbd.rst
- -F:    fs/ksmbd/
- -F:    fs/smbfs_common/
+ +F:    Documentation/filesystems/smb/ksmbd.rst
+ +F:    fs/smb/common/
+ +F:    fs/smb/server/
   
   KERNEL UNIT TESTING FRAMEWORK (KUnit)
   M:    Brendan Higgins <[email protected]>
@@@ -11398,8 -11311,6 +11398,8 @@@ L:   [email protected]
   L:    [email protected]
   S:    Maintained
   W:    https://google.github.io/kunit-docs/third_party/kernel/docs/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes
   F:    Documentation/dev-tools/kunit/
   F:    include/kunit/
   F:    lib/kunit/
@@@ -11448,6 -11359,7 +11448,6 @@@ F:   tools/testing/selftests/kvm/aarch64
   
   KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
   M:    Huacai Chen <[email protected]>
- -M:    Aleksandar Markovic <[email protected]>
   L:    [email protected]
   L:    [email protected]
   S:    Maintained
@@@ -11457,13 -11369,7 +11457,13 @@@ F: arch/mips/include/uapi/asm/kvm
   F:    arch/mips/kvm/
   
   KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
+ +M:    Michael Ellerman <[email protected]>
+ +R:    Nicholas Piggin <[email protected]>
   L:    [email protected]
+ +L:    [email protected]
+ +S:    Maintained (Book3S 64-bit HV)
+ +S:    Odd fixes (Book3S 64-bit PR)
+ +S:    Orphan (Book3E and 32-bit)
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm
   F:    arch/powerpc/include/asm/kvm*
   F:    arch/powerpc/include/uapi/asm/kvm*
@@@ -11825,7 -11731,7 +11825,7 @@@ LEGO MINDSTORMS EV
   R:    David Lechner <[email protected]>
   S:    Maintained
   F:    Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml
- -F:    arch/arm/boot/dts/da850-lego-ev3.dts
+ +F:    arch/arm/boot/dts/ti/davinci/da850-lego-ev3.dts
   F:    drivers/power/supply/lego_ev3_battery.c
   
   LEGO USB Tower driver
@@@ -11996,12 -11902,11 +11996,12 @@@ F:        lib/linear_ranges.
   F:    lib/test_linear_ranges.c
   
   LINUX FOR POWER MACINTOSH
- -M:    Benjamin Herrenschmidt <[email protected]>
   L:    [email protected]
- -S:    Odd Fixes
+ +S:    Orphan
   F:    arch/powerpc/platforms/powermac/
   F:    drivers/macintosh/
+ +X:    drivers/macintosh/adb-iop.c
+ +X:    drivers/macintosh/via-macii.c
   
   LINUX FOR POWERPC (32-BIT AND 64-BIT)
   M:    Michael Ellerman <[email protected]>
@@@ -12620,11 -12525,12 +12620,11 @@@ MARVELL NAND CONTROLLER DRIVE
   M:    Miquel Raynal <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/devicetree/bindings/mtd/marvell-nand.txt
   F:    drivers/mtd/nand/raw/marvell_nand.c
   
   MARVELL OCTEON ENDPOINT DRIVER
   M:    Veerasenareddy Burru <[email protected]>
- -M:    Abhijit Ayarekar <aayarekar@marvell.com>
+ +M:    Sathesh Edara <sedara@marvell.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/net/ethernet/marvell/octeon_ep
@@@ -12706,15 -12612,6 +12706,15 @@@ F: Documentation/userspace-api/media/dr
   F:    drivers/media/i2c/max2175*
   F:    include/uapi/linux/max2175.h
   
+ +MAX31827 TEMPERATURE SWITCH DRIVER
+ +M:    Daniel Matyas <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +W:    http://ez.analog.com/community/linux-device-drivers
+ +F:    Documentation/devicetree/bindings/hwmon/adi,max31827.yaml
+ +F:    Documentation/hwmon/max31827.rst
+ +F:    drivers/hwmon/max31827.c
+ +
   MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
   L:    [email protected]
   S:    Orphan
@@@ -12932,13 -12829,6 +12932,13 @@@ F: Documentation/devicetree/bindings/ne
   F:    drivers/net/ieee802154/mcr20a.c
   F:    drivers/net/ieee802154/mcr20a.h
   
+ +MDIO REGMAP DRIVER
+ +M:    Maxime Chevallier <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/net/mdio/mdio-regmap.c
+ +F:    include/linux/mdio/mdio-regmap.h
+ +
   MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
   M:    William Breathitt Gray <[email protected]>
   L:    [email protected]
@@@ -13238,15 -13128,6 +13238,15 @@@ S: Maintaine
   F:    drivers/net/pcs/pcs-mtk-lynxi.c
   F:    include/linux/pcs/pcs-mtk-lynxi.h
   
+ +MEDIATEK ETHERNET PHY DRIVERS
+ +M:    Daniel Golle <[email protected]>
+ +M:    Qingfang Deng <[email protected]>
+ +M:    SkyLake Huang <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/net/phy/mediatek-ge-soc.c
+ +F:    drivers/net/phy/mediatek-ge.c
+ +
   MEDIATEK I2C CONTROLLER DRIVER
   M:    Qii Wang <[email protected]>
   L:    [email protected]
@@@ -13308,7 -13189,6 +13308,7 @@@ R:   Shayne Chen <[email protected]
   R:    Sean Wang <[email protected]>
   L:    [email protected]
   S:    Maintained
+ +T:    git https://github.com/nbd168/wireless
   F:    Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
   F:    drivers/net/wireless/mediatek/mt76/
   
@@@ -13343,12 -13223,6 +13343,12 @@@ S: Maintaine
   F:    Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
   F:    drivers/i2c/busses/i2c-mt7621.c
   
+ +MEDIATEK MTMIPS CLOCK DRIVER
+ +M:    Sergio Paracuellos <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/clock/mediatek,mtmips-sysc.yaml
+ +F:    drivers/clk/ralink/clk-mtmips.c
+ +
   MEDIATEK NAND CONTROLLER DRIVER
   L:    [email protected]
   S:    Orphan
@@@ -13375,11 -13249,10 +13375,11 @@@ F:        drivers/memory/mtk-smi.
   F:    include/soc/mediatek/smi.h
   
   MEDIATEK SWITCH DRIVER
- -M:    Sean Wang <[email protected]>
+ +M:    Arınç ÜNAL <[email protected]>
+ +M:    Daniel Golle <[email protected]>
   M:    Landen Chao <[email protected]>
   M:    DENG Qingfang <[email protected]>
- -M:    Daniel Golle <[email protected]>
+ +M:    Sean Wang <[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    drivers/net/dsa/mt7530-mdio.c
@@@ -13744,7 -13617,6 +13744,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
   F:    Documentation/ABI/stable/sysfs-bus-mhi
   F:    Documentation/mhi/
   F:    drivers/bus/mhi/
+ +F:    drivers/pci/endpoint/functions/pci-epf-mhi.c
   F:    include/linux/mhi.h
   
   MICROBLAZE ARCHITECTURE
@@@ -13827,7 -13699,6 +13827,7 @@@ MICROCHIP EIC DRIVE
   M:    Claudiu Beznea <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Supported
+ +F:    Documentation/devicetree/bindings/interrupt-controller/microchip,sama7g5-eic.yaml
   F:    drivers/irqchip/irq-mchp-eic.c
   
   MICROCHIP I2C DRIVER
@@@ -13956,7 -13827,7 +13956,7 @@@ F:   drivers/tty/serial/8250/8250_pci1xxx
   
   MICROCHIP POLARFIRE FPGA DRIVERS
   M:    Conor Dooley <[email protected]>
- -R:    Ivan Bornyakov <i.bornyako[email protected]>
+ +R:    Vladimir Georgiev <v.georgie[email protected]>
   L:    [email protected]
   S:    Supported
   F:    Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
@@@ -14154,12 -14025,12 +14154,12 @@@ MIKROTIK CRS3XX 98DX3236 BOARD SUPPOR
   M:    Luka Kovacic <[email protected]>
   M:    Luka Perkov <[email protected]>
   S:    Maintained
- -F:    arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
- -F:    arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts
- -F:    arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
- -F:    arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts
- -F:    arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
- -F:    arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts
+ +F:    arch/arm/boot/dts/marvell/armada-xp-crs305-1g-4s-bit.dts
+ +F:    arch/arm/boot/dts/marvell/armada-xp-crs305-1g-4s.dts
+ +F:    arch/arm/boot/dts/marvell/armada-xp-crs326-24g-2s-bit.dts
+ +F:    arch/arm/boot/dts/marvell/armada-xp-crs326-24g-2s.dts
+ +F:    arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s-bit.dts
+ +F:    arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s.dts
   
   MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
   M:    Sakari Ailus <[email protected]>
@@@ -14262,7 -14133,7 +14262,7 @@@ R:   Lubomir Rintel <[email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Odd Fixes
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
- -F:    arch/arm/boot/dts/mmp*
+ +F:    arch/arm/boot/dts/marvell/mmp*
   F:    arch/arm/mach-mmp/
   F:    include/linux/soc/mmp/
   
@@@ -14802,7 -14673,7 +14802,7 @@@ NETWORKING [LABELED] (NetLabel, Labele
   M:    Paul Moore <[email protected]>
   L:    [email protected]
   L:    [email protected]
- -S:    Maintained
+ +S:    Supported
   W:    https://github.com/netlabel
   F:    Documentation/netlabel/
   F:    include/net/calipso.h
@@@ -14838,7 -14709,6 +14838,7 @@@ NETWORKING [TCP
   M:    Eric Dumazet <[email protected]>
   L:    [email protected]
   S:    Maintained
+ +F:    include/linux/net_mm.h
   F:    include/linux/tcp.h
   F:    include/net/tcp.h
   F:    include/trace/events/tcp.h
@@@ -15056,7 -14926,6 +15056,7 @@@ F:   drivers/ntb/hw/intel
   
   NTFS FILESYSTEM
   M:    Anton Altaparmakov <[email protected]>
+ +R:    Namjae Jeon <[email protected]>
   L:    [email protected]
   S:    Supported
   W:    http://www.tuxera.com/
@@@ -15395,13 -15264,19 +15395,13 @@@ M:        Tony Lindgren <[email protected]
   L:    [email protected]
   L:    [email protected]
   S:    Maintained
- -F:    arch/arm/boot/dts/*am3*
- -F:    arch/arm/boot/dts/*am4*
- -F:    arch/arm/boot/dts/*am5*
- -F:    arch/arm/boot/dts/*dra7*
- -F:    arch/arm/boot/dts/*omap*
- -F:    arch/arm/boot/dts/logicpd-som-lv*
- -F:    arch/arm/boot/dts/logicpd-torpedo*
+ +F:    arch/arm/boot/dts/ti/omap/
   
   OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
   L:    [email protected]
   L:    [email protected]
   S:    Orphan
- -F:    Documentation/arm/omap/dss.rst
+ +F:    Documentation/arch/arm/omap/dss.rst
   F:    drivers/video/fbdev/omap2/
   
   OMAP FRAMEBUFFER SUPPORT
@@@ -15503,7 -15378,7 +15503,7 @@@ OMAP/NEWFLOW NANOBONE MACHINE SUPPOR
   M:    Mark Jackson <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    arch/arm/boot/dts/am335x-nano.dts
+ +F:    arch/arm/boot/dts/ti/omap/am335x-nano.dts
   
   OMAP1 SUPPORT
   M:    Aaro Koskinen <[email protected]>
@@@ -15530,7 -15405,6 +15530,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
   F:    arch/arm/configs/omap2plus_defconfig
   F:    arch/arm/mach-omap2/
   F:    drivers/bus/ti-sysc.c
+ +F:    drivers/gpio/gpio-tps65219.c
   F:    drivers/i2c/busses/i2c-omap.c
   F:    drivers/irqchip/irq-omap-intc.c
   F:    drivers/mfd/*omap*.c
@@@ -15951,7 -15825,6 +15951,7 @@@ F:   include/media/i2c/ov2659.
   
   OVERLAY FILESYSTEM
   M:    Miklos Szeredi <[email protected]>
+ +M:    Amir Goldstein <[email protected]>
   L:    [email protected]
   S:    Supported
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
@@@ -16054,7 -15927,7 +16054,7 @@@ F:   include/uapi/linux/ppdev.
   
   PARAVIRT_OPS INTERFACE
   M:    Juergen Gross <[email protected]>
- -M:    Srivatsa S. Bhat (VMware) <[email protected]>
+ +R:    Ajay Kaher <[email protected]>
   R:    Alexey Makhalov <[email protected]>
   R:    VMware PV-Drivers Reviewers <[email protected]>
   L:    [email protected]
@@@ -16490,7 -16363,7 +16490,7 @@@ F:   Documentation/devicetree/bindings/pc
   F:    drivers/pci/controller/dwc/pcie-keembay.c
   
   PCIE DRIVER FOR INTEL LGM GW SOC
- -M:    Rahul Tanwar <rtanwar@maxlinear.com>
+ +M:    Chuanhua Lei <lchuanhua@maxlinear.com>
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
@@@ -16797,7 -16670,7 +16797,7 @@@ PIN CONTROLLER - QUALCOM
   M:    Bjorn Andersson <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
+ +F:    Documentation/devicetree/bindings/pinctrl/qcom,*
   F:    drivers/pinctrl/qcom/
   
   PIN CONTROLLER - RENESAS
@@@ -17252,7 -17125,7 +17252,7 @@@ L:   [email protected]
   S:    Maintained
   T:    git git://github.com/hzhuang1/linux.git
   T:    git git://github.com/rjarzmik/linux.git
- -F:    arch/arm/boot/dts/pxa*
+ +F:    arch/arm/boot/dts/intel/pxa/
   F:    arch/arm/mach-pxa/
   F:    drivers/dma/pxa*
   F:    drivers/pcmcia/pxa2xx*
@@@ -17290,7 -17163,6 +17290,7 @@@ F:   sound/soc/codecs/wcd9335.
   F:    sound/soc/codecs/wcd934x.c
   F:    sound/soc/codecs/wsa881x.c
   F:    sound/soc/codecs/wsa883x.c
+ +F:    sound/soc/codecs/wsa884x.c
   F:    sound/soc/qcom/
   
   QCOM EMBEDDED USB DEBUGGER (EUD)
@@@ -17465,8 -17337,6 +17465,8 @@@ QUALCOMM ATHEROS ATH11K WIRELESS DRIVE
   M:    Kalle Valo <[email protected]>
   L:    [email protected]
   S:    Supported
+ +W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
+ +B:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
   F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
   F:    drivers/net/wireless/ath/ath11k/
@@@ -17476,7 -17346,6 +17476,7 @@@ M:   Toke Høiland-Jørgensen <toke@toke.
   L:    [email protected]
   S:    Maintained
   W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
   F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
   F:    drivers/net/wireless/ath/ath9k/
   
@@@ -17509,8 -17378,6 +17509,8 @@@ F:   include/dt-bindings/clock/qcom,
   
   QUALCOMM CLOUD AI (QAIC) DRIVER
   M:    Jeffrey Hugo <[email protected]>
+ +R:    Carl Vanderlip <[email protected]>
+ +R:    Pranjal Ramajor Asha Kanojiya <[email protected]>
   L:    [email protected]
   L:    [email protected]
   S:    Supported
@@@ -17908,7 -17775,7 +17908,7 @@@ M:   Boqun Feng <[email protected]
   R:    Steven Rostedt <[email protected]>
   R:    Mathieu Desnoyers <[email protected]>
   R:    Lai Jiangshan <[email protected]>
- -R:    Zqiang <qiang1.zhang@intel.com>
+ +R:    Zqiang <qiang.zhang1211@gmail.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.rdrop.com/users/paulmck/RCU/
@@@ -17939,7 -17806,7 +17939,7 @@@ F:   tools/testing/selftests/rtc
   Real-time Linux Analysis (RTLA) tools
   M:    Daniel Bristot de Oliveira <[email protected]>
   M:    Steven Rostedt <[email protected]>
- -L:    linux-trace-dev[email protected]
+ +L:    linux-trace-kern[email protected]
   S:    Maintained
   F:    Documentation/tools/rtla/
   F:    tools/tracing/rtla/
@@@ -18160,14 -18027,6 +18160,14 @@@ S: Maintaine
   F:    Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml
   F:    drivers/usb/gadget/udc/renesas_usbf.c
   
+ +RENESAS RZ/V2M I2C DRIVER
+ +M:    Fabrizio Castro <[email protected]>
+ +L:    [email protected]
+ +L:    [email protected]
+ +S:    Supported
+ +F:    Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml
+ +F:    drivers/i2c/busses/i2c-rzv2m.c
+ +
   RENESAS USB PHY DRIVER
   M:    Yoshihiro Shimoda <[email protected]>
   L:    [email protected]
@@@ -18291,8 -18150,6 +18291,8 @@@ Q:   https://patchwork.kernel.org/project
   T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
   F:    Documentation/devicetree/bindings/riscv/
   F:    arch/riscv/boot/dts/
+ +X:    arch/riscv/boot/dts/allwinner/
+ +X:    arch/riscv/boot/dts/renesas/
   
   RISC-V PMU DRIVERS
   M:    Atish Patra <[email protected]>
@@@ -18303,14 -18160,6 +18303,14 @@@ F: drivers/perf/riscv_pmu.
   F:    drivers/perf/riscv_pmu_legacy.c
   F:    drivers/perf/riscv_pmu_sbi.c
   
+ +RISC-V THEAD SoC SUPPORT
+ +M:    Jisheng Zhang <[email protected]>
+ +M:    Guo Ren <[email protected]>
+ +M:    Fu Wei <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    arch/riscv/boot/dts/thead/
+ +
   RNBD BLOCK DRIVERS
   M:    Md. Haris Iqbal <[email protected]>
   M:    Jack Wang <[email protected]>
@@@ -18519,7 -18368,7 +18519,7 @@@ F:   drivers/infiniband/ulp/rtrs
   RUNTIME VERIFICATION (RV)
   M:    Daniel Bristot de Oliveira <[email protected]>
   M:    Steven Rostedt <[email protected]>
- -L:    linux-trace-dev[email protected]
+ +L:    linux-trace-kern[email protected]
   S:    Maintained
   F:    Documentation/trace/rv/
   F:    include/linux/rv.h
@@@ -18854,6 -18703,7 +18854,6 @@@ F:   include/dt-bindings/clock/samsung,*.
   F:    include/linux/clk/samsung.h
   
   SAMSUNG SPI DRIVERS
- -M:    Krzysztof Kozlowski <[email protected]>
   M:    Andi Shyti <[email protected]>
   L:    [email protected]
   L:    [email protected]
@@@ -18894,7 -18744,7 +18894,7 @@@ SANCLOUD BEAGLEBONE ENHANCED DEVICE TRE
   M:    Paul Barker <[email protected]>
   R:    Marc Murphy <[email protected]>
   S:    Supported
- -F:    arch/arm/boot/dts/am335x-sancloud*
+ +F:    arch/arm/boot/dts/ti/omap/am335x-sancloud*
   
   SC1200 WDT DRIVER
   M:    Zwane Mwaikambo <[email protected]>
@@@ -18921,16 -18771,6 +18921,16 @@@ F: include/linux/wait.
   F:    include/uapi/linux/sched.h
   F:    kernel/sched/
   
+ +SCSI LIBSAS SUBSYSTEM
+ +R:    John Garry <[email protected]>
+ +R:    Jason Yan <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +F:    drivers/scsi/libsas/
+ +F:    include/scsi/libsas.h
+ +F:    include/scsi/sas_ata.h
+ +F:    Documentation/scsi/libsas.rst
+ +
   SCSI RDMA PROTOCOL (SRP) INITIATOR
   M:    Bart Van Assche <[email protected]>
   L:    [email protected]
@@@ -19059,7 -18899,7 +19059,7 @@@ K:   \bsecure_computin
   K:    \bTIF_SECCOMP\b
   
   SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
- -M:    Kamal Dasu <kdasu.kdev@gmail.com>
+ +M:    Kamal Dasu <kamal.dasu@broadcom.com>
   M:    Al Cooper <[email protected]>
   R:    Broadcom internal kernel review list <[email protected]>
   L:    [email protected]
@@@ -19272,9 -19112,6 +19272,9 @@@ SHARED MEMORY COMMUNICATIONS (SMC) SOCK
   M:    Karsten Graul <[email protected]>
   M:    Wenjia Zhang <[email protected]>
   M:    Jan Karcher <[email protected]>
+ +R:    D. Wythe <[email protected]>
+ +R:    Tony Lu <[email protected]>
+ +R:    Wen Gu <[email protected]>
   L:    [email protected]
   S:    Supported
   F:    net/smc/
@@@ -19733,15 -19570,15 +19733,15 @@@ F:        include/uapi/linux/raid
   SOLIDRUN CLEARFOG SUPPORT
   M:    Russell King <[email protected]>
   S:    Maintained
- -F:    arch/arm/boot/dts/armada-388-clearfog*
- -F:    arch/arm/boot/dts/armada-38x-solidrun-*
+ +F:    arch/arm/boot/dts/marvell/armada-388-clearfog*
+ +F:    arch/arm/boot/dts/marvell/armada-38x-solidrun-*
   
   SOLIDRUN CUBOX-I/HUMMINGBOARD SUPPORT
   M:    Russell King <[email protected]>
   S:    Maintained
- -F:    arch/arm/boot/dts/imx6*-cubox-i*
- -F:    arch/arm/boot/dts/imx6*-hummingboard*
- -F:    arch/arm/boot/dts/imx6*-sr-*
+ +F:    arch/arm/boot/dts/nxp/imx/imx6*-cubox-i*
+ +F:    arch/arm/boot/dts/nxp/imx/imx6*-hummingboard*
+ +F:    arch/arm/boot/dts/nxp/imx/imx6*-sr-*
   
   SONIC NETWORK DRIVER
   M:    Thomas Bogendoerfer <[email protected]>
@@@ -20026,7 -19863,7 +20026,7 @@@ M:   [email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   W:    http://www.st.com/spear
- -F:    arch/arm/boot/dts/spear*
+ +F:    arch/arm/boot/dts/st/spear*
   F:    arch/arm/mach-spear/
   F:    drivers/clk/spear/
   F:    drivers/pinctrl/spear/
@@@ -20290,12 -20127,6 +20290,12 @@@ F: Documentation/devicetree/bindings/po
   F:    drivers/soc/starfive/jh71xx_pmu.c
   F:    include/dt-bindings/power/starfive,jh7110-pmu.h
   
+ +STARFIVE JH7110 TDM DRIVER
+ +M:    Walker Chen <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml
+ +F:    sound/soc/starfive/jh7110_tdm.c
+ +
   STARFIVE SOC DRIVERS
   M:    Conor Dooley <[email protected]>
   S:    Maintained
@@@ -21240,7 -21071,7 +21240,7 @@@ L:   [email protected]
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
   F:    Documentation/devicetree/bindings/i2c/i2c-davinci.txt
- -F:    arch/arm/boot/dts/da850*
+ +F:    arch/arm/boot/dts/ti/davinci/
   F:    arch/arm/mach-davinci/
   F:    drivers/i2c/busses/i2c-davinci.c
   
@@@ -22254,6 -22085,13 +22254,13 @@@ F: Documentation/filesystems/vfat.rs
   F:    fs/fat/
   F:    tools/testing/selftests/filesystems/fat/
   
+ VFIO CDX DRIVER
+ M:    Nipun Gupta <[email protected]>
+ M:    Nikhil Agarwal <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/vfio/cdx/*
+ 
   VFIO DRIVER
   M:    Alex Williamson <[email protected]>
   L:    [email protected]
@@@ -22335,6 -22173,7 +22342,6 @@@ L:   [email protected]
   S:    Maintained
   F:    drivers/video/fbdev/via/
   F:    include/linux/via-core.h
- -F:    include/linux/via-gpio.h
   F:    include/linux/via_i2c.h
   
   VIA VELOCITY NETWORK DRIVER
@@@ -22587,14 -22426,6 +22594,14 @@@ L: [email protected]
   S:    Maintained
   F:    fs/vboxsf/*
   
+ +VIRTUAL PCM TEST DRIVER
+ +M:    Ivan Orlov <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    Documentation/sound/cards/pcmtest.rst
+ +F:    sound/drivers/pcmtest.c
+ +F:    tools/testing/selftests/alsa/test-pcmtest-driver.c
+ +
   VIRTUAL SERIO DEVICE DRIVER
   M:    Stephen Chandler Paul <[email protected]>
   S:    Maintained
@@@ -22665,7 -22496,7 +22672,7 @@@ S:   Supporte
   F:    drivers/misc/vmw_balloon.c
   
   VMWARE HYPERVISOR INTERFACE
- -M:    Srivatsa S. Bhat (VMware) <[email protected]>
+ +M:    Ajay Kaher <[email protected]>
   M:    Alexey Makhalov <[email protected]>
   R:    VMware PV-Drivers Reviewers <[email protected]>
   L:    [email protected]
@@@ -22692,8 -22523,8 +22699,8 @@@ F:   drivers/scsi/vmw_pvscsi.
   F:    drivers/scsi/vmw_pvscsi.h
   
   VMWARE VIRTUAL PTP CLOCK DRIVER
- -M:    Srivatsa S. Bhat (VMware) <[email protected]>
   M:    Deep Shah <[email protected]>
+ +R:    Ajay Kaher <[email protected]>
   R:    Alexey Makhalov <[email protected]>
   R:    VMware PV-Drivers Reviewers <[email protected]>
   L:    [email protected]
@@@ -22916,13 -22747,6 +22923,13 @@@ L: [email protected]
   S:    Odd fixes
   F:    drivers/net/wireless/legacy/wl3501*
   
+ +WMI BINARY MOF DRIVER
+ +L:    [email protected]
+ +S:    Orphan
+ +F:    Documentation/ABI/stable/sysfs-platform-wmi-bmof
+ +F:    Documentation/wmi/devices/wmi-bmof.rst
+ +F:    drivers/platform/x86/wmi-bmof.c
+ +
   WOLFSON MICROELECTRONICS DRIVERS
   L:    [email protected]
   S:    Supported
@@@ -23302,9 -23126,8 +23309,9 @@@ F:   Documentation/devicetree/bindings/ii
   F:    drivers/iio/adc/xilinx-ams.c
   
   XILINX AXI ETHERNET DRIVER
- -M:    Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
+ +M:    Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
   F:    drivers/net/ethernet/xilinx/xilinx_axienet*
   
   XILINX CAN DRIVER
@@@ -23322,8 -23145,8 +23329,8 @@@ F:   drivers/soc/xilinx/xlnx_event_manage
   F:    include/linux/firmware/xlnx-event-manager.h
   
   XILINX GPIO DRIVER
- -M:    Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
- -R:    Srinivas Neeli <srinivas.neeli@xilinx.com>
+ +M:    Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
+ +R:    Srinivas Neeli <srinivas.neeli@amd.com>
   R:    Michal Simek <[email protected]>
   S:    Maintained
   F:    Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
@@@ -23338,8 -23161,8 +23345,8 @@@ F:   drivers/pwm/pwm-xilinx.
   F:    include/clocksource/timer-xilinx.h
   
   XILINX SD-FEC IP CORES
- -M:    Derek Kiernan <derek.kiernan@xilinx.com>
- -M:    Dragan Cvetic <dragan.cvetic@xilinx.com>
+ +M:    Derek Kiernan <derek.kiernan@amd.com>
+ +M:    Dragan Cvetic <dragan.cvetic@amd.com>
   S:    Maintained
   F:    Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt
   F:    Documentation/misc-devices/xilinx_sdfec.rst
@@@ -23355,6 -23178,7 +23362,6 @@@ S:   Maintaine
   F:    drivers/tty/serial/uartlite.c
   
   XILINX VIDEO IP CORES
- -M:    Hyun Kwon <[email protected]>
   M:    Laurent Pinchart <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -23383,6 -23207,7 +23390,6 @@@ F:   include/linux/dma/amd_xdma.
   F:    include/linux/platform_data/amd_xdma.h
   
   XILINX ZYNQMP DPDMA DRIVER
- -M:    Hyun Kwon <[email protected]>
   M:    Laurent Pinchart <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -23398,6 -23223,7 +23405,6 @@@ F:   Documentation/devicetree/bindings/me
   F:    drivers/edac/zynqmp_edac.c
   
   XILINX ZYNQMP PSGTR PHY DRIVER
- -M:    Anurag Kumar Vulisha <[email protected]>
   M:    Laurent Pinchart <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -23406,7 -23232,7 +23413,7 @@@ F:   Documentation/devicetree/bindings/ph
   F:    drivers/phy/xilinx/phy-zynqmp.c
   
   XILINX ZYNQMP SHA3 DRIVER
- -M:    Harsha <harsha.harsha@xilinx.com>
+ +M:    Harsha <harsha.harsha@amd.com>
   S:    Maintained
   F:    drivers/crypto/xilinx/zynqmp-sha.c
   
diff --combined include/uapi/linux/vfio.h

index b71276bd7f91608cdc088048258c82a317274378,9ab864c6f1ffafee6baf07b6746d6567e51d70e8..20c804bdc09c7536e5ddefb0f9b9dd2ed64d52f2
--- 1/include/uapi/linux/vfio.h
--- 2/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@@ -213,6 -213,7 +213,7 @@@ struct vfio_device_info 
   #define VFIO_DEVICE_FLAGS_AP  (1 << 5)        /* vfio-ap device */
   #define VFIO_DEVICE_FLAGS_FSL_MC (1 << 6)     /* vfio-fsl-mc device */
   #define VFIO_DEVICE_FLAGS_CAPS        (1 << 7)        /* Info supports caps */
+ #define VFIO_DEVICE_FLAGS_CDX (1 << 8)        /* vfio-cdx device */
         __u32   num_regions;    /* Max region index + 1 */
         __u32   num_irqs;       /* Max IRQ index + 1 */
         __u32   cap_offset;     /* Offset within info struct of first cap */
@@@ -240,6 -241,20 +241,20 @@@
   #define VFIO_DEVICE_INFO_CAP_ZPCI_UTIL                3
   #define VFIO_DEVICE_INFO_CAP_ZPCI_PFIP                4
   
+ /*
+  * The following VFIO_DEVICE_INFO capability reports support for PCIe AtomicOp
+  * completion to the root bus with supported widths provided via flags.
+  */
+ #define VFIO_DEVICE_INFO_CAP_PCI_ATOMIC_COMP  5
+ struct vfio_device_info_cap_pci_atomic_comp {
+       struct vfio_info_cap_header header;
+       __u32 flags;
+ #define VFIO_PCI_ATOMIC_COMP32        (1 << 0)
+ #define VFIO_PCI_ATOMIC_COMP64        (1 << 1)
+ #define VFIO_PCI_ATOMIC_COMP128       (1 << 2)
+       __u32 reserved;
+ };
+ 
   /**
    * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
    *                                   struct vfio_region_info)
@@@ -511,6 -526,9 +526,9 @@@ struct vfio_region_info_cap_nvlink2_lnk
    * then add and unmask vectors, it's up to userspace to make the decision
    * whether to allocate the maximum supported number of vectors or tear
    * down setup and incrementally increase the vectors as each is enabled.
+  * Absence of the NORESIZE flag indicates that vectors can be enabled
+  * and disabled dynamically without impacting other vectors within the
+  * index.
    */
   struct vfio_irq_info {
         __u32   argsz;
@@@ -646,15 -664,6 +664,15 @@@ enum 
         VFIO_CCW_NUM_IRQS
   };
   
+ +/*
+ + * The vfio-ap bus driver makes use of the following IRQ index mapping.
+ + * Unimplemented IRQ types return a count of zero.
+ + */
+ +enum {
+ +      VFIO_AP_REQ_IRQ_INDEX,
+ +      VFIO_AP_NUM_IRQS
+ +};
+ +
   /**
    * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 12,
    *                                          struct vfio_pci_hot_reset_info)
author	Linus Torvalds <[email protected]>
	Fri, 30 Jun 2023 22:22:09 +0000 (15:22 -0700)
committer	Linus Torvalds <[email protected]>
	Fri, 30 Jun 2023 22:22:09 +0000 (15:22 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/vfio.h	patch \|	diff1 \|	diff2 \|	blob \| history