Merge tag 'dmaengine-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

author Linus Torvalds <torvalds@linux-foundation.org>

Sun, 29 May 2022 18:38:27 +0000 (11:38 -0700)

committer Linus Torvalds <torvalds@linux-foundation.org>

Sun, 29 May 2022 18:38:27 +0000 (11:38 -0700)
author Linus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2022 18:38:27 +0000 (11:38 -0700)
committer Linus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2022 18:38:27 +0000 (11:38 -0700)
diff --combined Documentation/devicetree/bindings/dma/qcom,gpi.yaml

index d09d79d7406a3aa8378591c37c763f85683e197f,8a790ffbdaac95637c8584fd3e896a69b00a0cf5..7d2fc4eb55305eb683008f342f7dbb6e4cd01f35
--- 1/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
--- 2/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
+++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
@@@ -19,9 -19,12 +19,12 @@@ allOf
   properties:
     compatible:
       enum:
+       - qcom,sc7280-gpi-dma
         - qcom,sdm845-gpi-dma
         - qcom,sm8150-gpi-dma
         - qcom,sm8250-gpi-dma
+       - qcom,sm8350-gpi-dma
+       - qcom,sm8450-gpi-dma
   
     reg:
       maxItems: 1
@@@ -29,7 -32,6 +32,7 @@@
     interrupts:
       description:
         Interrupt lines for each GPI instance
+ +    minItems: 1
       maxItems: 13
   
     "#dma-cells":
diff --combined MAINTAINERS

index a0f251772b79a74aada82f66115e3ffe860c7d38,e7c0b08aae8cd5911046bf977a51508f742677d8..b85ee59e808b673a99408301dab623fe824d08d8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -201,7 -201,6 +201,7 @@@ F: include/net/ieee80211_radiotap.
   F:    include/net/iw_handler.h
   F:    include/net/wext.h
   F:    include/uapi/linux/nl80211.h
+ +F:    include/uapi/linux/wireless.h
   F:    net/wireless/
   
   8169 10/100/1000 GIGABIT ETHERNET DRIVER
@@@ -820,7 -819,7 +820,7 @@@ S: Maintaine
   F:    drivers/mailbox/mailbox-altera.c
   
   ALTERA MSGDMA IP CORE DRIVER
- M:    Olivier Dautricourt <olivier.dautricourt@orolia.com>
+ M:    Olivier Dautricourt <olivierdautricourt@gmail.com>
   R:    Stefan Roese <sr@denx.de>
   L:    dmaengine@vger.kernel.org
   S:    Odd Fixes
@@@ -1044,6 -1043,7 +1044,6 @@@ F:      arch/arm64/boot/dts/amd/amd-seattle-
   F:    drivers/net/ethernet/amd/xgbe/
   
   AMD SENSOR FUSION HUB DRIVER
- -M:    Nehal Shah <nehal-bakulchandra.shah@amd.com>
   M:    Basavaraj Natikar <basavaraj.natikar@amd.com>
   L:    linux-input@vger.kernel.org
   S:    Maintained
@@@ -1446,7 -1446,6 +1446,7 @@@ F:      drivers/media/i2c/aptina-pll.
   
   AQUACOMPUTER D5 NEXT PUMP SENSOR DRIVER
   M:    Aleksa Savic <savicaleksa83@gmail.com>
+ +M:    Jack Doan <me@jackdoan.com>
   L:    linux-hwmon@vger.kernel.org
   S:    Maintained
   F:    Documentation/hwmon/aquacomputer_d5next.rst
@@@ -1526,7 -1525,10 +1526,7 @@@ F:     Documentation/devicetree/bindings/mt
   F:    arch/arm/boot/dts/arm-realview-*
   F:    arch/arm/boot/dts/integrator*
   F:    arch/arm/boot/dts/versatile*
- -F:    arch/arm/mach-integrator/
- -F:    arch/arm/mach-realview/
   F:    arch/arm/mach-versatile/
- -F:    arch/arm/plat-versatile/
   F:    drivers/bus/arm-integrator-lm.c
   F:    drivers/clk/versatile/
   F:    drivers/i2c/busses/i2c-versatile.c
@@@ -1834,9 -1836,7 +1834,9 @@@ F:      Documentation/devicetree/bindings/ar
   F:    Documentation/devicetree/bindings/clock/apple,nco.yaml
   F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
   F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
+ +F:    Documentation/devicetree/bindings/iommu/apple,sart.yaml
   F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+ +F:    Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
   F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
   F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
   F:    Documentation/devicetree/bindings/power/apple*
@@@ -1847,14 -1847,12 +1847,14 @@@ F:   drivers/i2c/busses/i2c-pasemi-core.
   F:    drivers/i2c/busses/i2c-pasemi-platform.c
   F:    drivers/irqchip/irq-apple-aic.c
   F:    drivers/mailbox/apple-mailbox.c
+ +F:    drivers/nvme/host/apple.c
   F:    drivers/pinctrl/pinctrl-apple-gpio.c
   F:    drivers/soc/apple/*
   F:    drivers/watchdog/apple_wdt.c
   F:    include/dt-bindings/interrupt-controller/apple-aic.h
   F:    include/dt-bindings/pinctrl/apple.h
   F:    include/linux/apple-mailbox.h
+ +F:    include/linux/soc/apple/*
   
   ARM/ARTPEC MACHINE SUPPORT
   M:    Jesper Nilsson <jesper.nilsson@axis.com>
@@@ -2573,7 -2571,7 +2573,7 @@@ F:      Documentation/devicetree/bindings/ar
   F:    Documentation/devicetree/bindings/gpio/gpio-rda.yaml
   F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
   F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
- -F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
+ +F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
   F:    arch/arm/boot/dts/rda8810pl-*
   F:    drivers/clocksource/timer-rda.c
   F:    drivers/gpio/gpio-rda.c
@@@ -2638,14 -2636,13 +2638,14 @@@ F:   sound/soc/rockchip
   N:    rockchip
   
   ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   R:    Alim Akhtar <alim.akhtar@samsung.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   L:    linux-samsung-soc@vger.kernel.org
   S:    Maintained
   C:    irc://irc.libera.chat/linux-exynos
   Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
+ +B:    mailto:linux-samsung-soc@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
   F:    Documentation/arm/samsung/
   F:    Documentation/devicetree/bindings/arm/samsung/
@@@ -3102,16 -3099,6 +3102,16 @@@ S:    Maintaine
   F:    Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
   F:    drivers/mmc/host/sdhci-of-aspeed*
   
+ +ASPEED SMC SPI DRIVER
+ +M:    Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
+ +M:    Cédric Le Goater <clg@kaod.org>
+ +L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+ +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
+ +L:    linux-spi@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
+ +F:    drivers/spi/spi-aspeed-smc.c
+ +
   ASPEED VIDEO ENGINE DRIVER
   M:    Eddie James <eajames@linux.ibm.com>
   L:    linux-media@vger.kernel.org
@@@ -3582,9 -3569,8 +3582,9 @@@ M:      Andy Gospodarek <andy@greyhouse.net
   L:    netdev@vger.kernel.org
   S:    Supported
   W:    http://sourceforge.net/projects/bonding/
+ +F:    Documentation/networking/bonding.rst
   F:    drivers/net/bonding/
- -F:    include/net/bonding.h
+ +F:    include/net/bond*
   F:    include/uapi/linux/if_bonding.h
   
   BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
@@@ -3754,23 -3740,9 +3754,23 @@@ F:    drivers/net/dsa/bcm_sf2
   F:    include/linux/dsa/brcm.h
   F:    include/linux/platform_data/b53.h
   
+ +BROADCOM BCMBCA ARM ARCHITECTURE
+ +M:    William Zhang <william.zhang@broadcom.com>
+ +M:    Anand Gore <anand.gore@broadcom.com>
+ +M:    Kursad Oney <kursad.oney@broadcom.com>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +S:    Maintained
+ +T:    git git://github.com/broadcom/stblinux.git
+ +F:    Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+ +F:    arch/arm/boot/dts/bcm47622.dtsi
+ +F:    arch/arm/boot/dts/bcm947622.dts
+ +N:    bcmbca
+ +N:    bcm[9]?47622
+ +
   BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
   M:    Nicolas Saenz Julienne <nsaenz@kernel.org>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
@@@ -3780,13 -3752,12 +3780,13 @@@ F:   drivers/pci/controller/pcie-brcmstb.
   F:    drivers/staging/vc04_services
   N:    bcm2711
   N:    bcm283*
+ +N:    raspberrypi
   
   BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
   M:    Florian Fainelli <f.fainelli@gmail.com>
   M:    Ray Jui <rjui@broadcom.com>
   M:    Scott Branden <sbranden@broadcom.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   S:    Maintained
   T:    git git://github.com/broadcom/mach-bcm
   F:    arch/arm/mach-bcm/
@@@ -3806,7 -3777,7 +3806,7 @@@ F:      arch/mips/include/asm/mach-bcm47xx/
   
   BROADCOM BCM4908 ETHERNET DRIVER
   M:    Rafał Miłecki <rafal@milecki.pl>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
@@@ -3815,7 -3786,7 +3815,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
   
   BROADCOM BCM4908 PINMUX DRIVER
   M:    Rafał Miłecki <rafal@milecki.pl>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-gpio@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
@@@ -3825,7 -3796,7 +3825,7 @@@ BROADCOM BCM5301X ARM ARCHITECTUR
   M:    Florian Fainelli <f.fainelli@gmail.com>
   M:    Hauke Mehrtens <hauke@hauke-m.de>
   M:    Rafał Miłecki <zajec5@gmail.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   F:    arch/arm/boot/dts/bcm470*
@@@ -3836,7 -3807,7 +3836,7 @@@ F:      arch/arm/mach-bcm/bcm_5301x.
   BROADCOM BCM53573 ARM ARCHITECTURE
   M:    Florian Fainelli <f.fainelli@gmail.com>
   M:    Rafał Miłecki <rafal@milecki.pl>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   F:    arch/arm/boot/dts/bcm47189*
@@@ -3844,7 -3815,7 +3844,7 @@@ F:      arch/arm/boot/dts/bcm53573
   
   BROADCOM BCM63XX ARM ARCHITECTURE
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   T:    git git://github.com/broadcom/stblinux.git
@@@ -3858,7 -3829,7 +3858,7 @@@ F:      drivers/usb/gadget/udc/bcm63xx_udc.
   
   BROADCOM BCM7XXX ARM ARCHITECTURE
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   T:    git git://github.com/broadcom/stblinux.git
@@@ -3876,21 -3847,21 +3876,21 @@@ N:   bcm712
   BROADCOM BDC DRIVER
   M:    Al Cooper <alcooperx@gmail.com>
   L:    linux-usb@vger.kernel.org
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   S:    Maintained
   F:    Documentation/devicetree/bindings/usb/brcm,bdc.yaml
   F:    drivers/usb/gadget/udc/bdc/
   
   BROADCOM BMIPS CPUFREQ DRIVER
   M:    Markus Mayer <mmayer@broadcom.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-pm@vger.kernel.org
   S:    Maintained
   F:    drivers/cpufreq/bmips-cpufreq.c
   
   BROADCOM BMIPS MIPS ARCHITECTURE
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-mips@vger.kernel.org
   S:    Maintained
   T:    git git://github.com/broadcom/stblinux.git
@@@ -3941,9 -3912,7 +3941,9 @@@ BROADCOM BNXT_EN 50 GIGABIT ETHERNET DR
   M:    Michael Chan <michael.chan@broadcom.com>
   L:    netdev@vger.kernel.org
   S:    Supported
+ +F:    drivers/firmware/broadcom/tee_bnxt_fw.c
   F:    drivers/net/ethernet/broadcom/bnxt/
+ +F:    include/linux/firmware/broadcom/tee_bnxt_fw.h
   
   BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
   M:    Arend van Spriel <aspriel@gmail.com>
@@@ -3958,53 -3927,53 +3958,53 @@@ F:   drivers/net/wireless/broadcom/brcm80
   BROADCOM BRCMSTB GPIO DRIVER
   M:    Doug Berger <opendmb@gmail.com>
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   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>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-i2c@vger.kernel.org
- -L:    bcm-kernel-feedback-list@broadcom.com
   S:    Supported
   F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
   F:    drivers/i2c/busses/i2c-brcmstb.c
   
   BROADCOM BRCMSTB UART DRIVER
   M:    Al Cooper <alcooperx@gmail.com>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-serial@vger.kernel.org
- -L:    bcm-kernel-feedback-list@broadcom.com
   S:    Maintained
   F:    Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
   F:    drivers/tty/serial/8250/8250_bcm7271.c
   
   BROADCOM BRCMSTB USB EHCI DRIVER
   M:    Al Cooper <alcooperx@gmail.com>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-usb@vger.kernel.org
- -L:    bcm-kernel-feedback-list@broadcom.com
   S:    Maintained
   F:    Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
   F:    drivers/usb/host/ehci-brcm.*
   
   BROADCOM BRCMSTB USB PIN MAP DRIVER
   M:    Al Cooper <alcooperx@gmail.com>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-usb@vger.kernel.org
- -L:    bcm-kernel-feedback-list@broadcom.com
   S:    Maintained
   F:    Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
   F:    drivers/usb/misc/brcmstb-usb-pinmap.c
   
   BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
   M:    Al Cooper <alcooperx@gmail.com>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-kernel@vger.kernel.org
- -L:    bcm-kernel-feedback-list@broadcom.com
   S:    Maintained
   F:    drivers/phy/broadcom/phy-brcm-usb*
   
   BROADCOM ETHERNET PHY DRIVERS
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@@ -4015,7 -3984,7 +4015,7 @@@ F:      include/linux/brcmphy.
   BROADCOM GENET ETHERNET DRIVER
   M:    Doug Berger <opendmb@gmail.com>
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
@@@ -4029,7 -3998,7 +4029,7 @@@ F:      include/linux/platform_data/mdio-bcm
   BROADCOM IPROC ARM ARCHITECTURE
   M:    Ray Jui <rjui@broadcom.com>
   M:    Scott Branden <sbranden@broadcom.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   T:    git git://github.com/broadcom/stblinux.git
@@@ -4057,7 -4026,7 +4057,7 @@@ N:      stingra
   
   BROADCOM IPROC GBIT ETHERNET DRIVER
   M:    Rafał Miłecki <rafal@milecki.pl>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/net/brcm,amac.yaml
@@@ -4066,7 -4035,7 +4066,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
   
   BROADCOM KONA GPIO DRIVER
   M:    Ray Jui <rjui@broadcom.com>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   S:    Supported
   F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
   F:    drivers/gpio/gpio-bcm-kona.c
@@@ -4099,7 -4068,7 +4099,7 @@@ F:      drivers/firmware/broadcom/
   BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
   M:    Rafał Miłecki <rafal@milecki.pl>
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-pm@vger.kernel.org
   S:    Maintained
   T:    git git://github.com/broadcom/stblinux.git
@@@ -4115,7 -4084,7 +4115,7 @@@ F:      include/linux/bcma
   
   BROADCOM SPI DRIVER
   M:    Kamal Dasu <kdasu.kdev@gmail.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   S:    Maintained
   F:    Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
   F:    drivers/spi/spi-bcm-qspi.*
@@@ -4124,7 -4093,7 +4124,7 @@@ F:      drivers/spi/spi-iproc-qspi.
   
   BROADCOM STB AVS CPUFREQ DRIVER
   M:    Markus Mayer <mmayer@broadcom.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-pm@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
@@@ -4132,7 -4101,7 +4132,7 @@@ F:      drivers/cpufreq/brcmstb
   
   BROADCOM STB AVS TMON DRIVER
   M:    Markus Mayer <mmayer@broadcom.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-pm@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
@@@ -4140,7 -4109,7 +4140,7 @@@ F:      drivers/thermal/broadcom/brcmstb
   
   BROADCOM STB DPFE DRIVER
   M:    Markus Mayer <mmayer@broadcom.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
@@@ -4149,8 -4118,8 +4149,8 @@@ F:      drivers/memory/brcmstb_dpfe.
   BROADCOM STB NAND FLASH DRIVER
   M:    Brian Norris <computersforpeace@gmail.com>
   M:    Kamal Dasu <kdasu.kdev@gmail.com>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-mtd@lists.infradead.org
- -L:    bcm-kernel-feedback-list@broadcom.com
   S:    Maintained
   F:    drivers/mtd/nand/raw/brcmnand/
   F:    include/linux/platform_data/brcmnand.h
@@@ -4159,7 -4128,7 +4159,7 @@@ BROADCOM STB PCIE DRIVE
   M:    Jim Quinlan <jim2101024@gmail.com>
   M:    Nicolas Saenz Julienne <nsaenz@kernel.org>
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -M:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-pci@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
@@@ -4167,7 -4136,7 +4167,7 @@@ F:      drivers/pci/controller/pcie-brcmstb.
   
   BROADCOM SYSTEMPORT ETHERNET DRIVER
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/broadcom/bcmsysport.*
@@@ -4184,7 -4153,7 +4184,7 @@@ F:      drivers/net/ethernet/broadcom/tg3.
   
   BROADCOM VK DRIVER
   M:    Scott Branden <scott.branden@broadcom.com>
- -L:    bcm-kernel-feedback-list@broadcom.com
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   S:    Supported
   F:    drivers/misc/bcm-vk/
   F:    include/uapi/linux/misc/bcm_vk.h
@@@ -4402,6 -4371,7 +4402,6 @@@ F:      drivers/net/can
   F:    drivers/phy/phy-can-transceiver.c
   F:    include/linux/can/bittiming.h
   F:    include/linux/can/dev.h
- -F:    include/linux/can/led.h
   F:    include/linux/can/length.h
   F:    include/linux/can/platform/
   F:    include/linux/can/rx-offload.h
@@@ -4600,9 -4570,7 +4600,9 @@@ L:      keyrings@vger.kernel.or
   S:    Maintained
   F:    Documentation/admin-guide/module-signing.rst
   F:    certs/
+ +F:    scripts/check-blacklist-hashes.awk
   F:    scripts/sign-file.c
+ +F:    tools/certs/
   
   CFAG12864B LCD DRIVER
   M:    Miguel Ojeda <ojeda@kernel.org>
@@@ -4647,7 -4615,6 +4647,7 @@@ F:      Documentation/dev-tools/checkpatch.r
   
   CHINESE DOCUMENTATION
   M:    Alex Shi <alexs@kernel.org>
+ +M:    Yanteng Si <siyanteng@loongson.cn>
   S:    Maintained
   F:    Documentation/translations/zh_CN/
   
@@@ -4721,12 -4688,10 +4721,12 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
   M:    James Schulman <james.schulman@cirrus.com>
   M:    David Rhodes <david.rhodes@cirrus.com>
   M:    Lucas Tanure <tanureal@opensource.cirrus.com>
+ +M:    Richard Fitzgerald <rf@opensource.cirrus.com>
   L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
   L:    patches@opensource.cirrus.com
   S:    Maintained
   F:    Documentation/devicetree/bindings/sound/cirrus,cs*
+ +F:    include/dt-bindings/sound/cs*
   F:    sound/pci/hda/cs*
   F:    sound/soc/codecs/cs*
   
@@@ -4826,7 -4791,6 +4826,7 @@@ F:      .clang-forma
   CLANG/LLVM BUILD SUPPORT
   M:    Nathan Chancellor <nathan@kernel.org>
   M:    Nick Desaulniers <ndesaulniers@google.com>
+ +R:    Tom Rix <trix@redhat.com>
   L:    llvm@lists.linux.dev
   S:    Supported
   W:    https://clangbuiltlinux.github.io/
@@@ -5027,7 -4991,6 +5027,7 @@@ F:      Documentation/admin-guide/cgroup-v1
   F:    Documentation/admin-guide/cgroup-v2.rst
   F:    include/linux/cgroup*
   F:    kernel/cgroup/
+ +F:    tools/testing/selftests/cgroup/
   
   CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
   M:    Tejun Heo <tj@kernel.org>
@@@ -5056,15 -5019,11 +5056,15 @@@ M:   Johannes Weiner <hannes@cmpxchg.org
   M:    Michal Hocko <mhocko@kernel.org>
   M:    Roman Gushchin <roman.gushchin@linux.dev>
   M:    Shakeel Butt <shakeelb@google.com>
+ +R:    Muchun Song <songmuchun@bytedance.com>
   L:    cgroups@vger.kernel.org
   L:    linux-mm@kvack.org
   S:    Maintained
   F:    mm/memcontrol.c
   F:    mm/swap_cgroup.c
+ +F:    tools/testing/selftests/cgroup/memcg_protection.m
+ +F:    tools/testing/selftests/cgroup/test_kmem.c
+ +F:    tools/testing/selftests/cgroup/test_memcontrol.c
   
   CORETEMP HARDWARE MONITORING DRIVER
   M:    Fenghua Yu <fenghua.yu@intel.com>
@@@ -5086,6 -5045,12 +5086,6 @@@ S:     Maintaine
   F:    Documentation/hwmon/corsair-psu.rst
   F:    drivers/hwmon/corsair-psu.c
   
- -COSA/SRP SYNC SERIAL DRIVER
- -M:    Jan "Yenya" Kasprzak <kas@fi.muni.cz>
- -S:    Maintained
- -W:    http://www.fi.muni.cz/~kas/cosa/
- -F:    drivers/net/wan/cosa*
- -
   COUNTER SUBSYSTEM
   M:    William Breathitt Gray <vilhelm.gray@gmail.com>
   L:    linux-iio@vger.kernel.org
@@@ -5267,14 -5232,6 +5267,14 @@@ T:    git git://linuxtv.org/media_tree.gi
   F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
   F:    drivers/media/platform/sunxi/sun6i-csi/
   
+ +CTU CAN FD DRIVER
+ +M:    Pavel Pisa <pisa@cmp.felk.cvut.cz>
+ +M:    Ondrej Ille <ondrej.ille@gmail.com>
+ +L:    linux-can@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
+ +F:    drivers/net/can/ctucanfd/
+ +
   CW1200 WLAN driver
   M:    Solomon Peachy <pizza@shaftnet.org>
   S:    Maintained
@@@ -5477,7 -5434,6 +5477,7 @@@ F:      net/ax25/sysctl_net_ax25.
   
   DATA ACCESS MONITOR
   M:    SeongJae Park <sj@kernel.org>
+ +L:    damon@lists.linux.dev
   L:    linux-mm@kvack.org
   S:    Maintained
   F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
@@@ -5759,7 -5715,7 +5759,7 @@@ W:      http://lanana.org/docs/device-list/i
   
   DEVICE RESOURCE MANAGEMENT HELPERS
   M:    Hans de Goede <hdegoede@redhat.com>
- -R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
+ +R:    Matti Vaittinen <mazziesaccount@gmail.com>
   S:    Maintained
   F:    include/linux/devm-helpers.h
   
@@@ -5956,7 -5912,7 +5956,7 @@@ R:      Benjamin Gaignard <benjamin.gaignard
   R:    Liam Mark <lmark@codeaurora.org>
   R:    Laura Abbott <labbott@redhat.com>
   R:    Brian Starkey <Brian.Starkey@arm.com>
- -R:    John Stultz <john.stultz@linaro.org>
+ +R:    John Stultz <jstultz@google.com>
   L:    linux-media@vger.kernel.org
   L:    dri-devel@lists.freedesktop.org
   L:    linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
@@@ -6031,12 -5987,6 +6031,12 @@@ L:    linux-doc@vger.kernel.or
   S:    Maintained
   F:    Documentation/translations/it_IT
   
+ +DOCUMENTATION/JAPANESE
+ +R:    Akira Yokosawa <akiyks@gmail.com>
+ +L:    linux-doc@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/translations/ja_JP
+ +
   DONGWOON DW9714 LENS VOICE COIL DRIVER
   M:    Sakari Ailus <sakari.ailus@linux.intel.com>
   L:    linux-media@vger.kernel.org
@@@ -6303,9 -6253,8 +6303,9 @@@ F:      drivers/gpu/drm/tiny/panel-mipi-dbi.
   
   DRM DRIVER FOR MSM ADRENO GPU
   M:    Rob Clark <robdclark@gmail.com>
- -M:    Sean Paul <sean@poorly.run>
- -R:    Abhinav Kumar <quic_abhinavk@quicinc.com>
+ +M:    Abhinav Kumar <quic_abhinavk@quicinc.com>
+ +M:    Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+ +R:    Sean Paul <sean@poorly.run>
   L:    linux-arm-msm@vger.kernel.org
   L:    dri-devel@lists.freedesktop.org
   L:    freedreno@lists.freedesktop.org
@@@ -6358,11 -6307,6 +6358,11 @@@ S:    Maintaine
   F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
   F:    drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
   
+ +DRM DRIVER FOR PARADE PS8640 BRIDGE CHIP
+ +R:    Douglas Anderson <dianders@chromium.org>
+ +F:    Documentation/devicetree/bindings/display/bridge/ps8640.yaml
+ +F:    drivers/gpu/drm/bridge/parade-ps8640.c
+ +
   DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
   M:    Noralf Trønnes <noralf@tronnes.org>
   S:    Maintained
@@@ -6476,11 -6420,6 +6476,11 @@@ DRM DRIVER FOR TDFX VIDEO CARD
   S:    Orphan / Obsolete
   F:    drivers/gpu/drm/tdfx/
   
+ +DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
+ +R:    Douglas Anderson <dianders@chromium.org>
+ +F:    Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
+ +F:    drivers/gpu/drm/bridge/ti-sn65dsi86.c
+ +
   DRM DRIVER FOR TPO TPG110 PANELS
   M:    Linus Walleij <linus.walleij@linaro.org>
   S:    Maintained
@@@ -6600,7 -6539,6 +6600,7 @@@ R:      Jonas Karlman <jonas@kwiboo.se
   R:    Jernej Skrabec <jernej.skrabec@gmail.com>
   S:    Maintained
   T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +F:    Documentation/devicetree/bindings/display/bridge/
   F:    drivers/gpu/drm/bridge/
   
   DRM DRIVERS FOR EXYNOS
@@@ -6644,7 -6582,7 +6644,7 @@@ F:      drivers/gpu/drm/gma500
   DRM DRIVERS FOR HISILICON
   M:    Xinliang Liu <xinliang.liu@linaro.org>
   M:    Tian Tao  <tiantao6@hisilicon.com>
- -R:    John Stultz <john.stultz@linaro.org>
+ +R:    John Stultz <jstultz@google.com>
   R:    Xinwei Kong <kong.kongxinwei@hisilicon.com>
   R:    Chen Feng <puck.chen@hisilicon.com>
   L:    dri-devel@lists.freedesktop.org
@@@ -7440,6 -7378,7 +7440,6 @@@ L:      linux-mm@kvack.or
   S:    Supported
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
   F:    arch/alpha/kernel/binfmt_loader.c
- -F:    arch/x86/ia32/ia32_aout.c
   F:    fs/*binfmt_*.c
   F:    fs/exec.c
   F:    include/linux/binfmts.h
@@@ -7517,7 -7456,6 +7517,7 @@@ S:      Maintaine
   F:    Documentation/admin-guide/bootconfig.rst
   F:    fs/proc/bootconfig.c
   F:    include/linux/bootconfig.h
+ +F:    lib/bootconfig-data.S
   F:    lib/bootconfig.c
   F:    tools/bootconfig/*
   F:    tools/bootconfig/scripts/*
@@@ -7556,7 -7494,7 +7556,7 @@@ F:      Documentation/hwmon/f71805f.rs
   F:    drivers/hwmon/f71805f.c
   
   FADDR2LINE
- -M:    Josh Poimboeuf <jpoimboe@redhat.com>
+ +M:    Josh Poimboeuf <jpoimboe@kernel.org>
   S:    Maintained
   F:    scripts/faddr2line
   
@@@ -8169,7 -8107,7 +8169,7 @@@ M:      Ingo Molnar <mingo@redhat.com
   R:    Peter Zijlstra <peterz@infradead.org>
   R:    Darren Hart <dvhart@infradead.org>
   R:    Davidlohr Bueso <dave@stgolabs.net>
- -R:    André Almeida <andrealmeid@collabora.com>
+ +R:    André Almeida <andrealmeid@igalia.com>
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -8442,7 -8380,7 +8442,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
   M:    Bartosz Golaszewski <brgl@bgdev.pl>
   L:    linux-gpio@vger.kernel.org
   S:    Maintained
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
   F:    Documentation/ABI/obsolete/sysfs-gpio
   F:    Documentation/ABI/testing/gpio-cdev
   F:    Documentation/admin-guide/gpio/
@@@ -8613,6 -8551,17 +8613,6 @@@ L:     linux-efi@vger.kernel.or
   S:    Maintained
   F:    block/partitions/efi.*
   
- -H8/300 ARCHITECTURE
- -M:    Yoshinori Sato <ysato@users.sourceforge.jp>
- -L:    uclinux-h8-devel@lists.sourceforge.jp (moderated for non-subscribers)
- -S:    Maintained
- -W:    http://uclinux-h8.sourceforge.jp
- -T:    git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
- -F:    arch/h8300/
- -F:    drivers/clk/h8300/
- -F:    drivers/clocksource/h8300_*.c
- -F:    drivers/irqchip/irq-renesas-h8*.c
- -
   HABANALABS PCI DRIVER
   M:    Oded Gabbay <ogabbay@kernel.org>
   S:    Supported
@@@ -8726,6 -8675,7 +8726,6 @@@ F:      include/linux/cciss*.
   F:    include/uapi/linux/cciss*.h
   
   HFI1 DRIVER
- -M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
   M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
   L:    linux-rdma@vger.kernel.org
   S:    Supported
@@@ -8798,14 -8748,6 +8798,14 @@@ F:    drivers/hid/hid-sensor-
   F:    drivers/iio/*/hid-*
   F:    include/linux/hid-sensor-*
   
+ +HID WACOM DRIVER
+ +M:    Ping Cheng <ping.cheng@wacom.com>
+ +M:    Jason Gerecke  <jason.gerecke@wacom.com>
+ +L:    linux-input@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/hid/wacom.h
+ +F:    drivers/hid/wacom_*
+ +
   HIGH-RESOLUTION TIMERS, CLOCKEVENTS
   M:    Thomas Gleixner <tglx@linutronix.de>
   L:    linux-kernel@vger.kernel.org
@@@ -8821,6 -8763,7 +8821,6 @@@ F:      kernel/time/timer_*.
   HIGH-SPEED SCC DRIVER FOR AX.25
   L:    linux-hams@vger.kernel.org
   S:    Orphan
- -F:    drivers/net/hamradio/dmascc.c
   F:    drivers/net/hamradio/scc.c
   
   HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
@@@ -8901,7 -8844,7 +8901,7 @@@ F:      Documentation/devicetree/bindings/ne
   F:    drivers/net/ethernet/hisilicon/
   
   HIKEY960 ONBOARD USB GPIO HUB DRIVER
- -M:    John Stultz <john.stultz@linaro.org>
+ +M:    John Stultz <jstultz@google.com>
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
   F:    drivers/misc/hisi_hikey_usb.c
@@@ -9070,20 -9013,16 +9070,20 @@@ S:   Orpha
   F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
   F:    drivers/net/ethernet/huawei/hinic/
   
- -HUGETLB FILESYSTEM
+ +HUGETLB SUBSYSTEM
   M:    Mike Kravetz <mike.kravetz@oracle.com>
+ +M:    Muchun Song <songmuchun@bytedance.com>
   L:    linux-mm@kvack.org
   S:    Maintained
   F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
   F:    Documentation/admin-guide/mm/hugetlbpage.rst
   F:    Documentation/vm/hugetlbfs_reserv.rst
+ +F:    Documentation/vm/vmemmap_dedup.rst
   F:    fs/hugetlbfs/
   F:    include/linux/hugetlb.h
   F:    mm/hugetlb.c
+ +F:    mm/hugetlb_vmemmap.c
+ +F:    mm/hugetlb_vmemmap.h
   
   HVA ST MEDIA DRIVER
   M:    Jean-Christophe Trotin <jean-christophe.trotin@foss.st.com>
@@@ -9397,12 -9336,14 +9397,12 @@@ F:   drivers/pci/hotplug/rpaphp
   
   IBM Power SRIOV Virtual NIC Device Driver
   M:    Dany Madden <drt@linux.ibm.com>
- -M:    Sukadev Bhattiprolu <sukadev@linux.ibm.com>
   R:    Thomas Falcon <tlfalcon@linux.ibm.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmvnic.*
   
   IBM Power Virtual Accelerator Switchboard
- -M:    Sukadev Bhattiprolu <sukadev@linux.ibm.com>
   L:    linuxppc-dev@lists.ozlabs.org
   S:    Supported
   F:    arch/powerpc/include/asm/vas.h
@@@ -9657,7 -9598,6 +9657,7 @@@ F:      drivers/iio/pressure/dps310.
   
   INFINIBAND SUBSYSTEM
   M:    Jason Gunthorpe <jgg@nvidia.com>
+ +M:    Leon Romanovsky <leonro@nvidia.com>
   L:    linux-rdma@vger.kernel.org
   S:    Supported
   W:    https://github.com/linux-rdma/rdma-core
@@@ -9919,14 -9859,6 +9919,14 @@@ B:    https://bugzilla.kernel.or
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
   F:    drivers/idle/intel_idle.c
   
+ +INTEL IN FIELD SCAN (IFS) DEVICE
+ +M:    Jithu Joseph <jithu.joseph@intel.com>
+ +R:    Ashok Raj <ashok.raj@intel.com>
+ +R:    Tony Luck <tony.luck@intel.com>
+ +S:    Maintained
+ +F:    drivers/platform/x86/intel/ifs
+ +F:    include/trace/events/intel_ifs.h
+ +
   INTEL INTEGRATED SENSOR HUB DRIVER
   M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
   M:    Jiri Kosina <jikos@kernel.org>
@@@ -10052,7 -9984,6 +10052,7 @@@ S:    Supporte
   F:    Documentation/driver-api/mei/*
   F:    drivers/misc/mei/
   F:    drivers/watchdog/mei_wdt.c
+ +F:    include/linux/mei_aux.h
   F:    include/linux/mei_cl_bus.h
   F:    include/uapi/linux/mei.h
   F:    samples/mei/*
@@@ -10197,7 -10128,7 +10197,7 @@@ S:   Supporte
   F:    drivers/net/wireless/intel/iwlegacy/
   
   INTEL WIRELESS WIFI LINK (iwlwifi)
- -M:    Luca Coelho <luciano.coelho@intel.com>
+ +M:    Gregory Greenman <gregory.greenman@intel.com>
   L:    linux-wireless@vger.kernel.org
   S:    Supported
   W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@@ -10306,6 -10237,8 +10306,6 @@@ F:   drivers/net/ethernet/sgi/ioc3-eth.
   IOMAP FILESYSTEM LIBRARY
   M:    Christoph Hellwig <hch@infradead.org>
   M:    Darrick J. Wong <djwong@kernel.org>
- -M:    linux-xfs@vger.kernel.org
- -M:    linux-fsdevel@vger.kernel.org
   L:    linux-xfs@vger.kernel.org
   L:    linux-fsdevel@vger.kernel.org
   S:    Supported
@@@ -10436,7 -10369,6 +10436,7 @@@ F:   include/linux/isapnp.
   ISCSI
   M:    Lee Duncan <lduncan@suse.com>
   M:    Chris Leech <cleech@redhat.com>
+ +M:    Mike Christie <michael.christie@oracle.com>
   L:    open-iscsi@googlegroups.com
   L:    linux-scsi@vger.kernel.org
   S:    Maintained
@@@ -10614,7 -10546,6 +10614,7 @@@ M:   Andrey Ryabinin <ryabinin.a.a@gmail.
   R:    Alexander Potapenko <glider@google.com>
   R:    Andrey Konovalov <andreyknvl@gmail.com>
   R:    Dmitry Vyukov <dvyukov@google.com>
+ +R:    Vincenzo Frascino <vincenzo.frascino@arm.com>
   L:    kasan-dev@googlegroups.com
   S:    Maintained
   F:    Documentation/dev-tools/kasan.rst
@@@ -10833,8 -10764,6 +10833,8 @@@ T:   git git://github.com/kvm-riscv/linux
   F:    arch/riscv/include/asm/kvm*
   F:    arch/riscv/include/uapi/asm/kvm*
   F:    arch/riscv/kvm/
+ +F:    tools/testing/selftests/kvm/*/riscv/
+ +F:    tools/testing/selftests/kvm/riscv/
   
   KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
   M:    Christian Borntraeger <borntraeger@linux.ibm.com>
@@@ -10849,12 -10778,9 +10849,12 @@@ F: Documentation/virt/kvm/s390
   F:    arch/s390/include/asm/gmap.h
   F:    arch/s390/include/asm/kvm*
   F:    arch/s390/include/uapi/asm/kvm*
+ +F:    arch/s390/include/uapi/asm/uvdevice.h
   F:    arch/s390/kernel/uv.c
   F:    arch/s390/kvm/
   F:    arch/s390/mm/gmap.c
+ +F:    drivers/s390/char/uvdevice.c
+ +F:    tools/testing/selftests/drivers/s390x/uvdevice/
   F:    tools/testing/selftests/kvm/*/s390x/
   F:    tools/testing/selftests/kvm/s390x/
   
@@@ -10927,15 -10853,6 +10927,15 @@@ S: Supporte
   F:    include/keys/trusted_tee.h
   F:    security/keys/trusted-keys/trusted_tee.c
   
+ +KEYS-TRUSTED-CAAM
+ +M:    Ahmad Fatoum <a.fatoum@pengutronix.de>
+ +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
+ +L:    linux-integrity@vger.kernel.org
+ +L:    keyrings@vger.kernel.org
+ +S:    Maintained
+ +F:    include/keys/trusted_caam.h
+ +F:    security/keys/trusted-keys/trusted_caam.c
+ +
   KEYS/KEYRINGS
   M:    David Howells <dhowells@redhat.com>
   M:    Jarkko Sakkinen <jarkko@kernel.org>
@@@ -10990,7 -10907,6 +10990,7 @@@ F:   drivers/tty/serial/kgdboc.
   F:    include/linux/kdb.h
   F:    include/linux/kgdb.h
   F:    kernel/debug/
+ +F:    kernel/module/kdb.c
   
   KHADAS MCU MFD DRIVER
   M:    Neil Armstrong <narmstrong@baylibre.com>
@@@ -11292,7 -11208,7 +11292,7 @@@ F:   scripts/spdxcheck.p
   
   LINEAR RANGES HELPERS
   M:    Mark Brown <broonie@kernel.org>
- -R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
+ +R:    Matti Vaittinen <mazziesaccount@gmail.com>
   F:    lib/linear_ranges.c
   F:    lib/test_linear_ranges.c
   F:    include/linux/linear_range.h
@@@ -11429,7 -11345,7 +11429,7 @@@ F:   drivers/mmc/host/litex_mmc.
   N:    litex
   
   LIVE PATCHING
- -M:    Josh Poimboeuf <jpoimboe@redhat.com>
+ +M:    Josh Poimboeuf <jpoimboe@kernel.org>
   M:    Jiri Kosina <jikos@kernel.org>
   M:    Miroslav Benes <mbenes@suse.cz>
   M:    Petr Mladek <pmladek@suse.com>
@@@ -11444,7 -11360,6 +11444,7 @@@ F:   arch/s390/include/asm/livepatch.
   F:    arch/x86/include/asm/livepatch.h
   F:    include/linux/livepatch.h
   F:    kernel/livepatch/
+ +F:    kernel/module/livepatch.c
   F:    lib/livepatch/
   F:    samples/livepatch/
   F:    tools/testing/selftests/livepatch/
@@@ -11910,16 -11825,9 +11910,16 @@@ MARVELL XENON MMC/SD/SDIO HOST CONTROLL
   M:    Hu Ziji <huziji@marvell.com>
   L:    linux-mmc@vger.kernel.org
   S:    Supported
- -F:    Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
+ +F:    Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
   F:    drivers/mmc/host/sdhci-xenon*
   
+ +MARVELL OCTEON ENDPOINT DRIVER
+ +M:    Veerasenareddy Burru <vburru@marvell.com>
+ +M:    Abhijit Ayarekar <aayarekar@marvell.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/ethernet/marvell/octeon_ep
+ +
   MATROX FRAMEBUFFER DRIVER
   L:    linux-fbdev@vger.kernel.org
   S:    Orphan
@@@ -11997,7 -11905,7 +11997,7 @@@ F:   drivers/iio/proximity/mb1232.
   
   MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
   R:    Iskren Chernev <iskren.chernev@gmail.com>
- -R:    Krzysztof Kozlowski <krzk@kernel.org>
+ +R:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   R:    Marek Szyprowski <m.szyprowski@samsung.com>
   R:    Matheus Castello <matheus@castello.eng.br>
   L:    linux-pm@vger.kernel.org
@@@ -12007,7 -11915,7 +12007,7 @@@ F:   drivers/power/supply/max17040_batter
   
   MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
   R:    Hans de Goede <hdegoede@redhat.com>
- -R:    Krzysztof Kozlowski <krzk@kernel.org>
+ +R:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   R:    Marek Szyprowski <m.szyprowski@samsung.com>
   R:    Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
   R:    Purism Kernel Team <kernel@puri.sm>
@@@ -12059,11 -11967,10 +12059,11 @@@ F:        Documentation/devicetree/bindings/po
   F:    drivers/power/supply/max77976_charger.c
   
   MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
   L:    linux-pm@vger.kernel.org
   S:    Supported
+ +B:    mailto:linux-samsung-soc@vger.kernel.org
   F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
   F:    Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
   F:    drivers/power/supply/max14577_charger.c
@@@ -12071,11 -11978,10 +12071,11 @@@ F:        drivers/power/supply/max77693_charge
   
   MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
   M:    Chanwoo Choi <cw00.choi@samsung.com>
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
+ +B:    mailto:linux-samsung-soc@vger.kernel.org
   F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
   F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
   F:    Documentation/devicetree/bindings/*/maxim,max77693.yaml
@@@ -12245,7 -12151,7 +12245,7 @@@ T:   git git://linuxtv.org/media_tree.gi
   F:    Documentation/admin-guide/media/imx7.rst
   F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
   F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
- -F:    drivers/media/platform/imx/imx-mipi-csis.c
+ +F:    drivers/media/platform/nxp/imx-mipi-csis.c
   F:    drivers/staging/media/imx/imx7-media-csi.c
   
   MEDIA DRIVERS FOR HELENE
@@@ -12300,7 -12206,7 +12300,7 @@@ L:   linux-media@vger.kernel.or
   L:    linux-tegra@vger.kernel.org
   S:    Maintained
   T:    git git://linuxtv.org/media_tree.git
- -F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
+ +F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.yaml
   F:    drivers/media/platform/nvidia/tegra-vde/
   
   MEDIA DRIVERS FOR RENESAS - CEU
@@@ -12450,7 -12356,7 +12450,7 @@@ MEDIATEK I2C CONTROLLER DRIVE
   M:    Qii Wang <qii.wang@mediatek.com>
   L:    linux-i2c@vger.kernel.org
   S:    Maintained
- -F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
+ +F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
   F:    drivers/i2c/busses/i2c-mt65xx.c
   
   MEDIATEK IOMMU DRIVER
@@@ -12463,9 -12369,10 +12463,9 @@@ F:  drivers/iommu/mtk_iommu
   F:    include/dt-bindings/memory/mt*-port.h
   
   MEDIATEK JPEG DRIVER
- -M:    Rick Chang <rick.chang@mediatek.com>
   M:    Bin Liu <bin.liu@mediatek.com>
   S:    Supported
- -F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
+ +F:    Documentation/devicetree/bindings/media/mediatek-jpeg-*.yaml
   F:    drivers/media/platform/mediatek/jpeg/
   
   MEDIATEK MDP DRIVER
@@@ -12481,7 -12388,7 +12481,7 @@@ MEDIATEK MEDIA DRIVE
   M:    Tiffany Lin <tiffany.lin@mediatek.com>
   M:    Andrew-CT Chen <andrew-ct.chen@mediatek.com>
   S:    Supported
- -F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
+ +F:    Documentation/devicetree/bindings/media/mediatek,vcodec*.yaml
   F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
   F:    drivers/media/platform/mediatek/vcodec/
   F:    drivers/media/platform/mediatek/vpu/
@@@ -12494,7 -12401,7 +12494,7 @@@ F:   drivers/mmc/host/mtk-sd.
   
   MEDIATEK MT76 WIRELESS LAN DRIVER
   M:    Felix Fietkau <nbd@nbd.name>
- -M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+ +M:    Lorenzo Bianconi <lorenzo@kernel.org>
   M:    Ryder Lee <ryder.lee@mediatek.com>
   R:    Shayne Chen <shayne.chen@mediatek.com>
   R:    Sean Wang <sean.wang@mediatek.com>
@@@ -12568,17 -12475,6 +12568,17 @@@ S: Maintaine
   F:    drivers/net/dsa/mt7530.*
   F:    net/dsa/tag_mtk.c
   
+ +MEDIATEK T7XX 5G WWAN MODEM DRIVER
+ +M:    Chandrashekar Devegowda <chandrashekar.devegowda@intel.com>
+ +M:    Intel Corporation <linuxwwan@intel.com>
+ +R:    Chiranjeevi Rapolu <chiranjeevi.rapolu@linux.intel.com>
+ +R:    Liu Haijun <haijun.liu@mediatek.com>
+ +R:    M Chetan Kumar <m.chetan.kumar@linux.intel.com>
+ +R:    Ricardo Martinez <ricardo.martinez@linux.intel.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/wwan/t7xx/
+ +
   MEDIATEK USB3 DRD IP DRIVER
   M:    Chunfeng Yun <chunfeng.yun@mediatek.com>
   L:    linux-usb@vger.kernel.org
@@@ -12776,10 -12672,9 +12776,10 @@@ F: mm/memblock.
   F:    tools/testing/memblock/
   
   MEMORY CONTROLLER DRIVERS
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
+ +B:    mailto:krzysztof.kozlowski@linaro.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
   F:    Documentation/devicetree/bindings/memory-controllers/
   F:    drivers/memory/
@@@ -13008,13 -12903,6 +13008,13 @@@ F: drivers/net/dsa/microchip/
   F:    include/linux/platform_data/microchip-ksz.h
   F:    net/dsa/tag_ksz.c
   
+ +MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
+ +M:    Arun Ramadoss <arun.ramadoss@microchip.com>
+ +R:    UNGLinuxDriver@microchip.com
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/phy/microchip_t1.c
+ +
   MICROCHIP LAN743X ETHERNET DRIVER
   M:    Bryan Whitehead <bryan.whitehead@microchip.com>
   M:    UNGLinuxDriver@microchip.com
@@@ -13376,7 -13264,7 +13376,7 @@@ L:   linux-kernel@vger.kernel.or
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
   F:    include/linux/module.h
- -F:    kernel/module.c
+ +F:    kernel/module/
   
   MONOLITHIC POWER SYSTEM PMIC DRIVER
   M:    Saravanan Sekar <sravanhome@gmail.com>
@@@ -13640,21 -13528,12 +13640,21 @@@ M:        Samuel Mendoza-Jonas <sam@mendozajon
   S:    Maintained
   F:    net/ncsi/
   
- -NCT6775 HARDWARE MONITOR DRIVER
+ +NCT6775 HARDWARE MONITOR DRIVER - CORE & PLATFORM DRIVER
   M:    Guenter Roeck <linux@roeck-us.net>
   L:    linux-hwmon@vger.kernel.org
   S:    Maintained
   F:    Documentation/hwmon/nct6775.rst
- -F:    drivers/hwmon/nct6775.c
+ +F:    drivers/hwmon/nct6775-core.c
+ +F:    drivers/hwmon/nct6775-platform.c
+ +F:    drivers/hwmon/nct6775.h
+ +
+ +NCT6775 HARDWARE MONITOR DRIVER - I2C DRIVER
+ +M:    Zev Weiss <zev@bewilderbeest.net>
+ +L:    linux-hwmon@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
+ +F:    drivers/hwmon/nct6775-i2c.c
   
   NETDEVSIM
   M:    Jakub Kicinski <kuba@kernel.org>
@@@ -13744,7 -13623,6 +13744,7 @@@ F:   net/core/drop_monitor.
   
   NETWORKING DRIVERS
   M:    "David S. Miller" <davem@davemloft.net>
+ +M:    Eric Dumazet <edumazet@google.com>
   M:    Jakub Kicinski <kuba@kernel.org>
   M:    Paolo Abeni <pabeni@redhat.com>
   L:    netdev@vger.kernel.org
@@@ -13792,7 -13670,6 +13792,7 @@@ F:   tools/testing/selftests/drivers/net/
   
   NETWORKING [GENERAL]
   M:    "David S. Miller" <davem@davemloft.net>
+ +M:    Eric Dumazet <edumazet@google.com>
   M:    Jakub Kicinski <kuba@kernel.org>
   M:    Paolo Abeni <pabeni@redhat.com>
   L:    netdev@vger.kernel.org
@@@ -13887,7 -13764,6 +13887,7 @@@ F:   include/net/mptcp.
   F:    include/trace/events/mptcp.h
   F:    include/uapi/linux/mptcp.h
   F:    net/mptcp/
+ +F:    tools/testing/selftests/bpf/*/*mptcp*.c
   F:    tools/testing/selftests/net/mptcp/
   
   NETWORKING [TCP]
@@@ -13940,11 -13816,10 +13940,11 @@@ F:        include/uapi/linux/nexthop.
   F:    net/ipv4/nexthop.c
   
   NFC SUBSYSTEM
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   L:    linux-nfc@lists.01.org (subscribers-only)
   L:    netdev@vger.kernel.org
   S:    Maintained
+ +B:    mailto:linux-nfc@lists.01.org
   F:    Documentation/devicetree/bindings/net/nfc/
   F:    drivers/nfc/
   F:    include/linux/platform_data/nfcmrvl.h
@@@ -14258,7 -14133,7 +14258,7 @@@ F:   Documentation/devicetree/bindings/re
   F:    drivers/regulator/pf8x00-regulator.c
   
   NXP PTN5150A CC LOGIC AND EXTCON DRIVER
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@@ -14315,7 -14190,7 +14315,7 @@@ R:   NXP Linux Team <linux-imx@nxp.com
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
- -F:    drivers/media/platform/imx-jpeg
+ +F:    drivers/media/platform/nxp/imx-jpeg
   
   NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
   M:    Jonas Malaco <jonas@protocubo.io>
@@@ -14340,7 -14215,7 +14340,7 @@@ F:   lib/objagg.
   F:    lib/test_objagg.c
   
   OBJTOOL
- -M:    Josh Poimboeuf <jpoimboe@redhat.com>
+ +M:    Josh Poimboeuf <jpoimboe@kernel.org>
   M:    Peter Zijlstra <peterz@infradead.org>
   S:    Supported
   F:    tools/objtool/
@@@ -14488,6 -14363,7 +14488,6 @@@ F:   arch/arm/*omap*/*pm
   F:    drivers/cpufreq/omap-cpufreq.c
   
   OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
- -M:    Rajendra Nayak <rnayak@codeaurora.org>
   M:    Paul Walmsley <paul@pwsan.com>
   L:    linux-omap@vger.kernel.org
   S:    Maintained
@@@ -14513,7 -14389,6 +14513,7 @@@ F:   arch/arm/boot/dts/am335x-nano.dt
   
   OMAP1 SUPPORT
   M:    Aaro Koskinen <aaro.koskinen@iki.fi>
+ +M:    Janusz Krzysztofik <jmkrzyszt@gmail.com>
   M:    Tony Lindgren <tony@atomide.com>
   L:    linux-omap@vger.kernel.org
   S:    Maintained
@@@ -14781,6 -14656,7 +14781,6 @@@ F:   drivers/rtc/rtc-optee.
   
   OPA-VNIC DRIVER
   M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
- -M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
   L:    linux-rdma@vger.kernel.org
   S:    Supported
   F:    drivers/infiniband/ulp/opa_vnic
@@@ -14811,7 -14687,7 +14811,7 @@@ F:   scripts/dtc
   
   OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
   M:    Rob Herring <robh+dt@kernel.org>
- -M:    Krzysztof Kozlowski <krzk+dt@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
   L:    devicetree@vger.kernel.org
   S:    Maintained
   C:    irc://irc.libera.chat/devicetree
@@@ -14949,19 -14825,6 +14949,19 @@@ F: Documentation/core-api/padata.rs
   F:    include/linux/padata.h
   F:    kernel/padata.c
   
+ +PAGE CACHE
+ +M:    Matthew Wilcox (Oracle) <willy@infradead.org>
+ +L:    linux-fsdevel@vger.kernel.org
+ +S:    Supported
+ +T:    git git://git.infradead.org/users/willy/pagecache.git
+ +F:    Documentation/filesystems/locking.rst
+ +F:    Documentation/filesystems/vfs.rst
+ +F:    include/linux/pagemap.h
+ +F:    mm/filemap.c
+ +F:    mm/page-writeback.c
+ +F:    mm/readahead.c
+ +F:    mm/truncate.c
+ +
   PAGE POOL
   M:    Jesper Dangaard Brouer <hawk@kernel.org>
   M:    Ilias Apalodimas <ilias.apalodimas@linaro.org>
@@@ -15494,7 -15357,7 +15494,7 @@@ PCIE DRIVER FOR SOCIONEXT UNIPHIE
   M:    Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
   L:    linux-pci@vger.kernel.org
   S:    Maintained
- -F:    Documentation/devicetree/bindings/pci/uniphier-pcie*
+ +F:    Documentation/devicetree/bindings/pci/socionext,uniphier-pcie*
   F:    drivers/pci/controller/dwc/pcie-uniphier*
   
   PCIE DRIVER FOR ST SPEAR13XX
@@@ -15604,8 -15467,7 +15604,8 @@@ F:   tools/perf
   PERFORMANCE EVENTS TOOLING ARM64
   R:    John Garry <john.garry@huawei.com>
   R:    Will Deacon <will@kernel.org>
- -R:    Mathieu Poirier <mathieu.poirier@linaro.org>
+ +R:    James Clark <james.clark@arm.com>
+ +R:    Mike Leach <mike.leach@linaro.org>
   R:    Leo Yan <leo.yan@linaro.org>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Supported
@@@ -15737,7 -15599,7 +15737,7 @@@ F:   drivers/pinctrl/renesas
   
   PIN CONTROLLER - SAMSUNG
   M:    Tomasz Figa <tomasz.figa@gmail.com>
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
   R:    Alim Akhtar <alim.akhtar@samsung.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -15745,7 -15607,6 +15745,7 @@@ L:   linux-samsung-soc@vger.kernel.or
   S:    Maintained
   C:    irc://irc.libera.chat/linux-exynos
   Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
+ +B:    mailto:linux-samsung-soc@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
   F:    Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
   F:    drivers/pinctrl/samsung/
@@@ -15994,9 -15855,7 +15994,9 @@@ F:   kernel/printk
   PRINTK INDEXING
   R:    Chris Down <chris@chrisdown.name>
   S:    Maintained
+ +F:    Documentation/core-api/printk-index.rst
   F:    kernel/printk/index.c
+ +K:    printk_index
   
   PROC FILESYSTEM
   L:    linux-kernel@vger.kernel.org
@@@ -16100,6 -15959,7 +16100,6 @@@ F:   include/asm-generic/syscall.
   F:    include/linux/ptrace.h
   F:    include/linux/regset.h
   F:    include/uapi/linux/ptrace.h
- -F:    include/uapi/linux/ptrace.h
   F:    kernel/ptrace.c
   
   PULSE8-CEC DRIVER
@@@ -16110,12 -15970,6 +16110,12 @@@ T: git git://linuxtv.org/media_tree.gi
   F:    Documentation/admin-guide/media/pulse8-cec.rst
   F:    drivers/media/cec/usb/pulse8/
   
+ +PURELIFI PLFXLC DRIVER
+ +M:    Srinivasan Raju <srini.raju@purelifi.com>
+ +L:    linux-wireless@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/wireless/purelifi/plfxlc/
+ +
   PVRUSB2 VIDEO4LINUX DRIVER
   M:    Mike Isely <isely@pobox.com>
   L:    pvrusb2@isely.net       (subscribers-only)
@@@ -16244,6 -16098,7 +16244,6 @@@ F:   include/uapi/linux/qemu_fw_cfg.
   
   QIB DRIVER
   M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
- -M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
   L:    linux-rdma@vger.kernel.org
   S:    Supported
   F:    drivers/infiniband/hw/qib/
@@@ -16583,7 -16438,6 +16583,7 @@@ S:   Supporte
   T:    git https://gitlab.freedesktop.org/agd5f/linux.git
   B:    https://gitlab.freedesktop.org/drm/amd/-/issues
   C:    irc://irc.oftc.net/radeon
+ +F:    Documentation/gpu/amdgpu/
   F:    drivers/gpu/drm/amd/
   F:    drivers/gpu/drm/radeon/
   F:    include/uapi/drm/amdgpu_drm.h
@@@ -16648,13 -16502,6 +16648,13 @@@ L: linux-mips@vger.kernel.or
   S:    Maintained
   F:    arch/mips/boot/dts/ralink/mt7621*
   
+ +RALINK PINCTRL DRIVER
+ +M:    Arınç ÜNAL <arinc.unal@arinc9.com>
+ +M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
+ +L:    linux-mips@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/pinctrl/ralink/
+ +
   RALINK RT2X00 WIRELESS LAN DRIVER
   M:    Stanislaw Gruszka <stf_xl@wp.pl>
   M:    Helmut Schaa <helmut.schaa@googlemail.com>
@@@ -16769,6 -16616,7 +16769,6 @@@ F:   drivers/net/ethernet/rdc/r6040.
   
   RDMAVT - RDMA verbs software
   M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
- -M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
   L:    linux-rdma@vger.kernel.org
   S:    Supported
   F:    drivers/infiniband/sw/rdmavt
@@@ -17163,7 -17011,8 +17163,7 @@@ S:   Odd Fixe
   F:    drivers/tty/serial/rp2.*
   
   ROHM BD99954 CHARGER IC
- -R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
- -L:    linux-power@fi.rohmeurope.com
+ +R:    Matti Vaittinen <mazziesaccount@gmail.com>
   S:    Supported
   F:    drivers/power/supply/bd99954-charger.c
   F:    drivers/power/supply/bd99954-charger.h
@@@ -17186,7 -17035,8 +17186,7 @@@ F:   drivers/regulator/bd9571mwv-regulato
   F:    include/linux/mfd/bd9571mwv.h
   
   ROHM POWER MANAGEMENT IC DEVICE DRIVERS
- -R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
- -L:    linux-power@fi.rohmeurope.com
+ +R:    Matti Vaittinen <mazziesaccount@gmail.com>
   S:    Supported
   F:    drivers/clk/clk-bd718x7.c
   F:    drivers/gpio/gpio-bd71815.c
@@@ -17428,7 -17278,7 +17428,7 @@@ W:   http://www.ibm.com/developerworks/li
   F:    drivers/s390/scsi/zfcp_*
   
   S3C ADC BATTERY DRIVER
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   L:    linux-samsung-soc@vger.kernel.org
   S:    Odd Fixes
   F:    drivers/power/supply/s3c_adc_battery.c
@@@ -17473,16 -17323,15 +17473,16 @@@ F:        Documentation/admin-guide/LSM/SafeSe
   F:    security/safesetid/
   
   SAMSUNG AUDIO (ASoC) DRIVERS
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
   L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
   S:    Supported
+ +B:    mailto:linux-samsung-soc@vger.kernel.org
   F:    Documentation/devicetree/bindings/sound/samsung*
   F:    sound/soc/samsung/
   
   SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   L:    linux-crypto@vger.kernel.org
   L:    linux-samsung-soc@vger.kernel.org
   S:    Maintained
@@@ -17517,12 -17366,11 +17517,12 @@@ S:        Maintaine
   F:    drivers/platform/x86/samsung-laptop.c
   
   SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
   L:    linux-kernel@vger.kernel.org
   L:    linux-samsung-soc@vger.kernel.org
   S:    Supported
+ +B:    mailto:linux-samsung-soc@vger.kernel.org
   F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
   F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
   F:    Documentation/devicetree/bindings/mfd/samsung,s5m*.yaml
@@@ -17544,7 -17392,7 +17544,7 @@@ F:   drivers/media/platform/samsung/s3c-c
   F:    include/media/drv-intf/s3c_camif.h
   
   SAMSUNG S3FWRN5 NFC DRIVER
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Krzysztof Opasiak <k.opasiak@samsung.com>
   L:    linux-nfc@lists.01.org (subscribers-only)
   S:    Maintained
@@@ -17566,7 -17414,7 +17566,7 @@@ S:   Supporte
   F:    drivers/media/i2c/s5k5baf.c
   
   SAMSUNG S5P Security SubSystem (SSS) DRIVER
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Vladimir Zapolskiy <vz@mleia.com>
   L:    linux-crypto@vger.kernel.org
   L:    linux-samsung-soc@vger.kernel.org
@@@ -17601,7 -17449,7 +17601,7 @@@ F:   include/linux/clk/samsung.
   F:    include/linux/platform_data/clk-s3c2410.h
   
   SAMSUNG SPI DRIVERS
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   M:    Andi Shyti <andi@etezian.org>
   L:    linux-spi@vger.kernel.org
   L:    linux-samsung-soc@vger.kernel.org
@@@ -17619,7 -17467,7 +17619,7 @@@ F:   drivers/net/ethernet/samsung/sxgbe
   
   SAMSUNG THERMAL DRIVER
   M:    Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
- -M:    Krzysztof Kozlowski <krzk@kernel.org>
+ +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
   L:    linux-pm@vger.kernel.org
   L:    linux-samsung-soc@vger.kernel.org
   S:    Maintained
@@@ -17660,7 -17508,6 +17660,7 @@@ R:   Steven Rostedt <rostedt@goodmis.org
   R:    Ben Segall <bsegall@google.com> (CONFIG_CFS_BANDWIDTH)
   R:    Mel Gorman <mgorman@suse.de> (CONFIG_NUMA_BALANCING)
   R:    Daniel Bristot de Oliveira <bristot@redhat.com> (SCHED_DEADLINE)
+ +R:    Valentin Schneider <vschneid@redhat.com> (TOPOLOGY)
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -17804,8 -17651,8 +17804,8 @@@ K:   \bTIF_SECCOMP\
   
   SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
   M:    Al Cooper <alcooperx@gmail.com>
+ +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
   L:    linux-mmc@vger.kernel.org
- -L:    bcm-kernel-feedback-list@broadcom.com
   S:    Maintained
   F:    drivers/mmc/host/sdhci-brcmstb*
   
@@@ -18135,8 -17982,8 +18135,8 @@@ F:   drivers/platform/x86/touchscreen_dmi
   SILICON LABS WIRELESS DRIVERS (for WFxxx series)
   M:    Jérôme Pouiller <jerome.pouiller@silabs.com>
   S:    Supported
- -F:    Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml
- -F:    drivers/staging/wfx/
+ +F:    Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
+ +F:    drivers/net/wireless/silabs/wfx/
   
   SILICON MOTION SM712 FRAME BUFFER DRIVER
   M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@@ -18249,7 -18096,6 +18249,7 @@@ M:   Joonsoo Kim <iamjoonsoo.kim@lge.com
   M:    Andrew Morton <akpm@linux-foundation.org>
   M:    Vlastimil Babka <vbabka@suse.cz>
   R:    Roman Gushchin <roman.gushchin@linux.dev>
+ +R:    Hyeonggon Yoo <42.hyeyoo@gmail.com>
   L:    linux-mm@kvack.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
@@@ -18939,7 -18785,7 +18939,7 @@@ F:   include/dt-bindings/reset/starfive-j
   
   STATIC BRANCH/CALL
   M:    Peter Zijlstra <peterz@infradead.org>
- -M:    Josh Poimboeuf <jpoimboe@redhat.com>
+ +M:    Josh Poimboeuf <jpoimboe@kernel.org>
   M:    Jason Baron <jbaron@akamai.com>
   R:    Steven Rostedt <rostedt@goodmis.org>
   R:    Ard Biesheuvel <ardb@kernel.org>
@@@ -19023,14 -18869,6 +19023,14 @@@ L: netdev@vger.kernel.or
   S:    Maintained
   F:    drivers/net/ethernet/dlink/sundance.c
   
+ +SUNPLUS ETHERNET DRIVER
+ +M:    Wells Lu <wellslutw@gmail.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +W:    https://sunplus.atlassian.net/wiki/spaces/doc/overview
+ +F:    Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml
+ +F:    drivers/net/ethernet/sunplus/
+ +
   SUNPLUS OCOTP DRIVER
   M:    Vincent Shih <vincent.sunplus@gmail.com>
   S:    Maintained
@@@ -19202,6 -19040,7 +19202,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
   M:    Viresh Kumar <vireshk@kernel.org>
   R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
   S:    Maintained
+ F:    Documentation/devicetree/bindings/dma/renesas,rzn1-dmamux.yaml
   F:    Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml
   F:    drivers/dma/dw/
   F:    include/dt-bindings/dma/dw-dmac.h
@@@ -19696,7 -19535,6 +19697,7 @@@ F:   drivers/thermal
   F:    include/linux/cpu_cooling.h
   F:    include/linux/thermal.h
   F:    include/uapi/linux/thermal.h
+ +F:    tools/lib/thermal/
   F:    tools/thermal/
   
   THERMAL DRIVER FOR AMLOGIC SOCS
@@@ -19949,7 -19787,7 +19950,7 @@@ F:   drivers/net/wireless/ti
   F:    include/linux/wl12xx.h
   
   TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
- -M:    John Stultz <john.stultz@linaro.org>
+ +M:    John Stultz <jstultz@google.com>
   M:    Thomas Gleixner <tglx@linutronix.de>
   R:    Stephen Boyd <sboyd@kernel.org>
   L:    linux-kernel@vger.kernel.org
@@@ -19996,7 -19834,6 +19997,7 @@@ F:   drivers/media/usb/tm6000
   TMIO/SDHI MMC DRIVER
   M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
   L:    linux-mmc@vger.kernel.org
+ +L:    linux-renesas-soc@vger.kernel.org
   S:    Supported
   F:    drivers/mmc/host/renesas_sdhi*
   F:    drivers/mmc/host/tmio_mmc*
@@@ -20006,7 -19843,6 +20007,7 @@@ TMP401 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <linux@roeck-us.net>
   L:    linux-hwmon@vger.kernel.org
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml
   F:    Documentation/hwmon/tmp401.rst
   F:    drivers/hwmon/tmp401.c
   
@@@ -20120,8 -19956,8 +20121,8 @@@ M:   Ingo Molnar <mingo@redhat.com
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
   F:    Documentation/trace/ftrace.rst
- -F:    arch/*/*/*/ftrace.h
- -F:    arch/*/kernel/ftrace.c
+ +F:    arch/*/*/*/*ftrace*
+ +F:    arch/*/*/*ftrace*
   F:    fs/tracefs/
   F:    include/*/ftrace.h
   F:    include/linux/trace*.h
@@@ -20690,6 -20526,7 +20691,6 @@@ F:   drivers/usb/host/uhci
   
   USB VIDEO CLASS
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- -L:    linux-uvc-devel@lists.sourceforge.net (subscribers-only)
   L:    linux-media@vger.kernel.org
   S:    Maintained
   W:    http://www.ideasonboard.org/uvc/
@@@ -21282,7 -21119,7 +21283,7 @@@ F:   include/linux/regulator
   K:    regulator_get_optional
   
   VOLTAGE AND CURRENT REGULATOR IRQ HELPERS
- -R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
+ +R:    Matti Vaittinen <mazziesaccount@gmail.com>
   F:    drivers/regulator/irq_helpers.c
   
   VRF
@@@ -21395,8 -21232,10 +21396,8 @@@ S:  Maintaine
   F:    drivers/hid/hid-wiimote*
   
   WILOCITY WIL6210 WIRELESS DRIVER
- -M:    Maya Erez <merez@codeaurora.org>
   L:    linux-wireless@vger.kernel.org
- -L:    wil6210@qti.qualcomm.com
- -S:    Supported
+ +S:    Orphan
   W:    https://wireless.wiki.kernel.org/en/users/Drivers/wil6210
   F:    drivers/net/wireless/ath/wil6210/
   
@@@ -21600,15 -21439,6 +21601,15 @@@ F: arch/x86/include/asm/uv
   F:    arch/x86/kernel/apic/x2apic_uv_x.c
   F:    arch/x86/platform/uv/
   
+ +X86 STACK UNWINDING
+ +M:    Josh Poimboeuf <jpoimboe@kernel.org>
+ +M:    Peter Zijlstra <peterz@infradead.org>
+ +S:    Supported
+ +F:    arch/x86/include/asm/unwind*.h
+ +F:    arch/x86/kernel/dumpstack.c
+ +F:    arch/x86/kernel/stacktrace.c
+ +F:    arch/x86/kernel/unwind_*.c
+ +
   X86 VDSO
   M:    Andy Lutomirski <luto@kernel.org>
   L:    linux-kernel@vger.kernel.org
@@@ -21667,7 -21497,6 +21668,7 @@@ K:   (?:\b|_)xdp(?:\b|_
   XDP SOCKETS (AF_XDP)
   M:    Björn Töpel <bjorn@kernel.org>
   M:    Magnus Karlsson <magnus.karlsson@intel.com>
+ +M:    Maciej Fijalkowski <maciej.fijalkowski@intel.com>
   R:    Jonathan Lemon <jonathan.lemon@gmail.com>
   L:    netdev@vger.kernel.org
   L:    bpf@vger.kernel.org
@@@ -21772,6 -21601,7 +21773,6 @@@ F:   drivers/xen/*swiotlb
   XFS FILESYSTEM
   C:    irc://irc.oftc.net/xfs
   M:    Darrick J. Wong <djwong@kernel.org>
- -M:    linux-xfs@vger.kernel.org
   L:    linux-xfs@vger.kernel.org
   S:    Supported
   W:    http://xfs.org/
@@@ -21801,7 -21631,7 +21802,7 @@@ M:   Appana Durga Kedareswara rao <appana
   R:    Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
   L:    linux-can@vger.kernel.org
   S:    Maintained
- -F:    Documentation/devicetree/bindings/net/can/xilinx_can.txt
+ +F:    Documentation/devicetree/bindings/net/can/xilinx,can.yaml
   F:    drivers/net/can/xilinx_can.c
   
   XILINX GPIO DRIVER
diff --combined drivers/clk/renesas/r9a06g032-clocks.c

index 1826aa73b713bb36de7912630cf9e6e744c74ea0,69c0eb0eabd18e2589761e36d3c45d5859648021..35ffc462af1ae3aec2dd07a9f3ef4bafcad2763f
--- 1/drivers/clk/renesas/r9a06g032-clocks.c
--- 2/drivers/clk/renesas/r9a06g032-clocks.c
+++ b/drivers/clk/renesas/r9a06g032-clocks.c
@@@ -16,13 -16,17 +16,17 @@@
   #include <linux/math64.h>
   #include <linux/of.h>
   #include <linux/of_address.h>
+ #include <linux/of_platform.h>
   #include <linux/platform_device.h>
   #include <linux/pm_clock.h>
   #include <linux/pm_domain.h>
   #include <linux/slab.h>
+ #include <linux/soc/renesas/r9a06g032-sysctrl.h>
   #include <linux/spinlock.h>
   #include <dt-bindings/clock/r9a06g032-sysctrl.h>
   
+ #define R9A06G032_SYSCTRL_DMAMUX 0xA0
+ 
   struct r9a06g032_gate {
         u16 gate, reset, ready, midle,
                 scon, mirack, mistat;
@@@ -256,7 -260,7 +260,7 @@@ static const struct r9a06g032_clkdesc r
         D_MODULE(HCLK_QSPI0, "hclk_qspi0", CLK_REF_SYNC_D4, 0x2a0, 0x2a1, 0x2a2, 0x2a3, 0x300, 0x301, 0x302),
         D_MODULE(HCLK_QSPI1, "hclk_qspi1", CLK_REF_SYNC_D4, 0x480, 0x481, 0x482, 0x483, 0x4c0, 0x4c1, 0x4c2),
         D_MODULE(HCLK_ROM, "hclk_rom", CLK_REF_SYNC_D4, 0xaa0, 0xaa1, 0xaa2, 0, 0xb80, 0, 0),
- -      D_MODULE(HCLK_RTC, "hclk_rtc", CLK_REF_SYNC_D8, 0xa00, 0, 0, 0, 0, 0, 0),
+ +      D_MODULE(HCLK_RTC, "hclk_rtc", CLK_REF_SYNC_D8, 0xa00, 0xa03, 0, 0xa02, 0, 0, 0),
         D_MODULE(HCLK_SDIO0, "hclk_sdio0", CLK_REF_SYNC_D4, 0x60, 0x61, 0x62, 0x63, 0x80, 0x81, 0x82),
         D_MODULE(HCLK_SDIO1, "hclk_sdio1", CLK_REF_SYNC_D4, 0x640, 0x641, 0x642, 0x643, 0x660, 0x661, 0x662),
         D_MODULE(HCLK_SEMAP, "hclk_semap", CLK_REF_SYNC_D4, 0x7a3, 0x7a4, 0x7a5, 0, 0xb21, 0, 0),
@@@ -315,6 -319,30 +319,30 @@@ struct r9a06g032_priv 
         void __iomem *reg;
   };
   
+ static struct r9a06g032_priv *sysctrl_priv;
+ 
+ /* Exported helper to access the DMAMUX register */
+ int r9a06g032_sysctrl_set_dmamux(u32 mask, u32 val)
+ {
+       unsigned long flags;
+       u32 dmamux;
+ 
+       if (!sysctrl_priv)
+               return -EPROBE_DEFER;
+ 
+       spin_lock_irqsave(&sysctrl_priv->lock, flags);
+ 
+       dmamux = readl(sysctrl_priv->reg + R9A06G032_SYSCTRL_DMAMUX);
+       dmamux &= ~mask;
+       dmamux |= val & mask;
+       writel(dmamux, sysctrl_priv->reg + R9A06G032_SYSCTRL_DMAMUX);
+ 
+       spin_unlock_irqrestore(&sysctrl_priv->lock, flags);
+ 
+       return 0;
+ }
+ EXPORT_SYMBOL_GPL(r9a06g032_sysctrl_set_dmamux);
+ 
   /* register/bit pairs are encoded as an uint16_t */
   static void
   clk_rdesc_set(struct r9a06g032_priv *clocks,
@@@ -963,7 -991,17 +991,17 @@@ static int __init r9a06g032_clocks_prob
         if (error)
                 return error;
   
-       return r9a06g032_add_clk_domain(dev);
+       error = r9a06g032_add_clk_domain(dev);
+       if (error)
+               return error;
+ 
+       sysctrl_priv = clocks;
+ 
+       error = of_platform_populate(np, NULL, NULL, dev);
+       if (error)
+               dev_err(dev, "Failed to populate children (%d)\n", error);
+ 
+       return 0;
   }
   
   static const struct of_device_id r9a06g032_match[] = {
diff --combined drivers/dma/at_xdmac.c

index def564d1e8faf714c167f25df26e109658117b29,1911861a39fac88f4302e693598a44b0ad0c0ff6..3e9d726504e2ed776ddc1155ef43130da5811533
--- 1/drivers/dma/at_xdmac.c
--- 2/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@@ -1202,6 -1202,7 +1202,7 @@@ static struct at_xdmac_desc *at_xdmac_m
         unsigned long           flags;
         size_t                  ublen;
         u32                     dwidth;
+       char                    pattern;
         /*
          * WARNING: The channel configuration is set here since there is no
          * dmaengine_slave_config call in this case. Moreover we don't know the
@@@ -1244,10 -1245,16 +1245,16 @@@
   
         chan_cc |= AT_XDMAC_CC_DWIDTH(dwidth);
   
+       /* Only the first byte of value is to be used according to dmaengine */
+       pattern = (char)value;
+ 
         ublen = len >> dwidth;
   
         desc->lld.mbr_da = dst_addr;
-       desc->lld.mbr_ds = value;
+       desc->lld.mbr_ds = (pattern << 24) |
+                          (pattern << 16) |
+                          (pattern << 8) |
+                          pattern;
         desc->lld.mbr_ubc = AT_XDMAC_MBR_UBC_NDV3
                 | AT_XDMAC_MBR_UBC_NDEN
                 | AT_XDMAC_MBR_UBC_NSEN
@@@ -1453,7 -1460,7 +1460,7 @@@ at_xdmac_tx_status(struct dma_chan *cha
   {
         struct at_xdmac_chan    *atchan = to_at_xdmac_chan(chan);
         struct at_xdmac         *atxdmac = to_at_xdmac(atchan->chan.device);
- -      struct at_xdmac_desc    *desc, *_desc;
+ +      struct at_xdmac_desc    *desc, *_desc, *iter;
         struct list_head        *descs_list;
         enum dma_status         ret;
         int                     residue, retry;
@@@ -1568,13 -1575,11 +1575,13 @@@
          * microblock.
          */
         descs_list = &desc->descs_list;
- -      list_for_each_entry_safe(desc, _desc, descs_list, desc_node) {
- -              dwidth = at_xdmac_get_dwidth(desc->lld.mbr_cfg);
- -              residue -= (desc->lld.mbr_ubc & 0xffffff) << dwidth;
- -              if ((desc->lld.mbr_nda & 0xfffffffc) == cur_nda)
+ +      list_for_each_entry_safe(iter, _desc, descs_list, desc_node) {
+ +              dwidth = at_xdmac_get_dwidth(iter->lld.mbr_cfg);
+ +              residue -= (iter->lld.mbr_ubc & 0xffffff) << dwidth;
+ +              if ((iter->lld.mbr_nda & 0xfffffffc) == cur_nda) {
+ +                      desc = iter;
                         break;
+ +              }
         }
         residue += cur_ubc << dwidth;
   
diff --combined drivers/dma/idxd/device.c

index f652da6ab47df1b29147136fd17c390d353c9a79,dd6a05eccb189600cb2eb479114dab1a555fc264..ff0ea60051f0c90e50463de27df0abf5b53f9e27
--- 1/drivers/dma/idxd/device.c
--- 2/drivers/dma/idxd/device.c
+++ b/drivers/dma/idxd/device.c
@@@ -184,7 -184,7 +184,7 @@@ int idxd_wq_enable(struct idxd_wq *wq
   
         if (wq->state == IDXD_WQ_ENABLED) {
                 dev_dbg(dev, "WQ %d already enabled\n", wq->id);
-               return -ENXIO;
+               return 0;
         }
   
         idxd_cmd_exec(idxd, IDXD_CMD_ENABLE_WQ, wq->id, &status);
@@@ -299,24 -299,46 +299,46 @@@ void idxd_wqs_unmap_portal(struct idxd_
         }
   }
   
- int idxd_wq_set_pasid(struct idxd_wq *wq, int pasid)
+ static void __idxd_wq_set_priv_locked(struct idxd_wq *wq, int priv)
   {
         struct idxd_device *idxd = wq->idxd;
-       int rc;
         union wqcfg wqcfg;
         unsigned int offset;
   
-       rc = idxd_wq_disable(wq, false);
-       if (rc < 0)
-               return rc;
+       offset = WQCFG_OFFSET(idxd, wq->id, WQCFG_PRIVL_IDX);
+       spin_lock(&idxd->dev_lock);
+       wqcfg.bits[WQCFG_PRIVL_IDX] = ioread32(idxd->reg_base + offset);
+       wqcfg.priv = priv;
+       wq->wqcfg->bits[WQCFG_PRIVL_IDX] = wqcfg.bits[WQCFG_PRIVL_IDX];
+       iowrite32(wqcfg.bits[WQCFG_PRIVL_IDX], idxd->reg_base + offset);
+       spin_unlock(&idxd->dev_lock);
+ }
+ 
+ static void __idxd_wq_set_pasid_locked(struct idxd_wq *wq, int pasid)
+ {
+       struct idxd_device *idxd = wq->idxd;
+       union wqcfg wqcfg;
+       unsigned int offset;
   
         offset = WQCFG_OFFSET(idxd, wq->id, WQCFG_PASID_IDX);
         spin_lock(&idxd->dev_lock);
         wqcfg.bits[WQCFG_PASID_IDX] = ioread32(idxd->reg_base + offset);
         wqcfg.pasid_en = 1;
         wqcfg.pasid = pasid;
+       wq->wqcfg->bits[WQCFG_PASID_IDX] = wqcfg.bits[WQCFG_PASID_IDX];
         iowrite32(wqcfg.bits[WQCFG_PASID_IDX], idxd->reg_base + offset);
         spin_unlock(&idxd->dev_lock);
+ }
+ 
+ int idxd_wq_set_pasid(struct idxd_wq *wq, int pasid)
+ {
+       int rc;
+ 
+       rc = idxd_wq_disable(wq, false);
+       if (rc < 0)
+               return rc;
+ 
+       __idxd_wq_set_pasid_locked(wq, pasid);
   
         rc = idxd_wq_enable(wq);
         if (rc < 0)
@@@ -555,19 -577,15 +577,15 @@@ int idxd_device_disable(struct idxd_dev
                 return -ENXIO;
         }
   
-       spin_lock(&idxd->dev_lock);
         idxd_device_clear_state(idxd);
-       idxd->state = IDXD_DEV_DISABLED;
-       spin_unlock(&idxd->dev_lock);
         return 0;
   }
   
   void idxd_device_reset(struct idxd_device *idxd)
   {
         idxd_cmd_exec(idxd, IDXD_CMD_RESET_DEVICE, 0, NULL);
-       spin_lock(&idxd->dev_lock);
         idxd_device_clear_state(idxd);
-       idxd->state = IDXD_DEV_DISABLED;
+       spin_lock(&idxd->dev_lock);
         idxd_unmask_error_interrupts(idxd);
         spin_unlock(&idxd->dev_lock);
   }
@@@ -694,26 -712,27 +712,30 @@@ static void idxd_device_wqs_clear_state
   {
         int i;
   
-       lockdep_assert_held(&idxd->dev_lock);
         for (i = 0; i < idxd->max_wqs; i++) {
                 struct idxd_wq *wq = idxd->wqs[i];
   
++              mutex_lock(&wq->wq_lock);
                 if (wq->state == IDXD_WQ_ENABLED) {
- -                      mutex_lock(&wq->wq_lock);
                         idxd_wq_disable_cleanup(wq);
- -                      idxd_wq_device_reset_cleanup(wq);
                         wq->state = IDXD_WQ_DISABLED;
- -                      mutex_unlock(&wq->wq_lock);
                 }
+ +              idxd_wq_device_reset_cleanup(wq);
++              mutex_unlock(&wq->wq_lock);
         }
   }
   
   void idxd_device_clear_state(struct idxd_device *idxd)
   {
+ +      if (!test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags))
+ +              return;
+ +
+       idxd_device_wqs_clear_state(idxd);
+       spin_lock(&idxd->dev_lock);
         idxd_groups_clear_state(idxd);
         idxd_engines_clear_state(idxd);
-       idxd_device_wqs_clear_state(idxd);
+       idxd->state = IDXD_DEV_DISABLED;
+       spin_unlock(&idxd->dev_lock);
   }
   
   static void idxd_group_config_write(struct idxd_group *group)
@@@ -799,7 -818,7 +821,7 @@@ static int idxd_wq_config_write(struct 
          */
         for (i = 0; i < WQCFG_STRIDES(idxd); i++) {
                 wq_offset = WQCFG_OFFSET(idxd, wq->id, i);
-               wq->wqcfg->bits[i] = ioread32(idxd->reg_base + wq_offset);
+               wq->wqcfg->bits[i] |= ioread32(idxd->reg_base + wq_offset);
         }
   
         if (wq->size == 0 && wq->type != IDXD_WQT_NONE)
@@@ -815,14 -834,8 +837,8 @@@
         if (wq_dedicated(wq))
                 wq->wqcfg->mode = 1;
   
-       if (device_pasid_enabled(idxd)) {
-               wq->wqcfg->pasid_en = 1;
-               if (wq->type == IDXD_WQT_KERNEL && wq_dedicated(wq))
-                       wq->wqcfg->pasid = idxd->pasid;
-       }
- 
         /*
-        * Here the priv bit is set depending on the WQ type. priv = 1 if the
+        * The WQ priv bit is set depending on the WQ type. priv = 1 if the
          * WQ type is kernel to indicate privileged access. This setting only
          * matters for dedicated WQ. According to the DSA spec:
          * If the WQ is in dedicated mode, WQ PASID Enable is 1, and the
@@@ -832,7 -845,6 +848,6 @@@
          * In the case of a dedicated kernel WQ that is not able to support
          * the PASID cap, then the configuration will be rejected.
          */
-       wq->wqcfg->priv = !!(wq->type == IDXD_WQT_KERNEL);
         if (wq_dedicated(wq) && wq->wqcfg->pasid_en &&
             !idxd_device_pasid_priv_enabled(idxd) &&
             wq->type == IDXD_WQT_KERNEL) {
@@@ -953,7 -965,7 +968,7 @@@ static int idxd_wqs_setup(struct idxd_d
                 if (!wq->group)
                         continue;
   
-               if (wq_shared(wq) && !device_swq_supported(idxd)) {
+               if (wq_shared(wq) && !wq_shared_supported(wq)) {
                         idxd->cmd_status = IDXD_SCMD_WQ_NO_SWQ_SUPPORT;
                         dev_warn(dev, "No shared wq support but configured.\n");
                         return -EINVAL;
@@@ -1018,6 -1030,9 +1033,9 @@@ static int idxd_wq_load_config(struct i
   
         wq->priority = wq->wqcfg->priority;
   
+       wq->max_xfer_bytes = 1ULL << wq->wqcfg->max_xfer_shift;
+       wq->max_batch_size = 1ULL << wq->wqcfg->max_batch_shift;
+ 
         for (i = 0; i < WQCFG_STRIDES(idxd); i++) {
                 wqcfg_offset = WQCFG_OFFSET(idxd, wq->id, i);
                 dev_dbg(dev, "WQ[%d][%d][%#x]: %#x\n", wq->id, i, wqcfg_offset, wq->wqcfg->bits[i]);
@@@ -1161,7 -1176,9 +1179,9 @@@ void idxd_wq_free_irq(struct idxd_wq *w
         struct idxd_device *idxd = wq->idxd;
         struct idxd_irq_entry *ie = &wq->ie;
   
-       synchronize_irq(ie->vector);
+       if (wq->type != IDXD_WQT_KERNEL)
+               return;
+ 
         free_irq(ie->vector, ie);
         idxd_flush_pending_descs(ie);
         if (idxd->request_int_handles)
@@@ -1180,6 -1197,9 +1200,9 @@@ int idxd_wq_request_irq(struct idxd_wq 
         struct idxd_irq_entry *ie;
         int rc;
   
+       if (wq->type != IDXD_WQT_KERNEL)
+               return 0;
+ 
         ie = &wq->ie;
         ie->vector = pci_irq_vector(pdev, ie->id);
         ie->pasid = device_pasid_enabled(idxd) ? idxd->pasid : INVALID_IOASID;
@@@ -1211,7 -1231,7 +1234,7 @@@ err_irq
         return rc;
   }
   
- int __drv_enable_wq(struct idxd_wq *wq)
+ int drv_enable_wq(struct idxd_wq *wq)
   {
         struct idxd_device *idxd = wq->idxd;
         struct device *dev = &idxd->pdev->dev;
@@@ -1245,7 -1265,7 +1268,7 @@@
   
         /* Shared WQ checks */
         if (wq_shared(wq)) {
-               if (!device_swq_supported(idxd)) {
+               if (!wq_shared_supported(wq)) {
                         idxd->cmd_status = IDXD_SCMD_WQ_NO_SVM;
                         dev_dbg(dev, "PASID not enabled and shared wq.\n");
                         goto err;
@@@ -1265,6 -1285,29 +1288,29 @@@
                 }
         }
   
+       /*
+        * In the event that the WQ is configurable for pasid and priv bits.
+        * For kernel wq, the driver should setup the pasid, pasid_en, and priv bit.
+        * However, for non-kernel wq, the driver should only set the pasid_en bit for
+        * shared wq. A dedicated wq that is not 'kernel' type will configure pasid and
+        * pasid_en later on so there is no need to setup.
+        */
+       if (test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags)) {
+               int priv = 0;
+ 
+               if (wq_pasid_enabled(wq)) {
+                       if (is_idxd_wq_kernel(wq) || wq_shared(wq)) {
+                               u32 pasid = wq_dedicated(wq) ? idxd->pasid : 0;
+ 
+                               __idxd_wq_set_pasid_locked(wq, pasid);
+                       }
+               }
+ 
+               if (is_idxd_wq_kernel(wq))
+                       priv = 1;
+               __idxd_wq_set_priv_locked(wq, priv);
+       }
+ 
         rc = 0;
         spin_lock(&idxd->dev_lock);
         if (test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags))
@@@ -1289,8 -1332,36 +1335,36 @@@
         }
   
         wq->client_count = 0;
+ 
+       rc = idxd_wq_request_irq(wq);
+       if (rc < 0) {
+               idxd->cmd_status = IDXD_SCMD_WQ_IRQ_ERR;
+               dev_dbg(dev, "WQ %d irq setup failed: %d\n", wq->id, rc);
+               goto err_irq;
+       }
+ 
+       rc = idxd_wq_alloc_resources(wq);
+       if (rc < 0) {
+               idxd->cmd_status = IDXD_SCMD_WQ_RES_ALLOC_ERR;
+               dev_dbg(dev, "WQ resource alloc failed\n");
+               goto err_res_alloc;
+       }
+ 
+       rc = idxd_wq_init_percpu_ref(wq);
+       if (rc < 0) {
+               idxd->cmd_status = IDXD_SCMD_PERCPU_ERR;
+               dev_dbg(dev, "percpu_ref setup failed\n");
+               goto err_ref;
+       }
+ 
         return 0;
   
+ err_ref:
+       idxd_wq_free_resources(wq);
+ err_res_alloc:
+       idxd_wq_free_irq(wq);
+ err_irq:
+       idxd_wq_unmap_portal(wq);
   err_map_portal:
         rc = idxd_wq_disable(wq, false);
         if (rc < 0)
@@@ -1299,17 -1370,7 +1373,7 @@@ err
         return rc;
   }
   
- int drv_enable_wq(struct idxd_wq *wq)
- {
-       int rc;
- 
-       mutex_lock(&wq->wq_lock);
-       rc = __drv_enable_wq(wq);
-       mutex_unlock(&wq->wq_lock);
-       return rc;
- }
- 
- void __drv_disable_wq(struct idxd_wq *wq)
+ void drv_disable_wq(struct idxd_wq *wq)
   {
         struct idxd_device *idxd = wq->idxd;
         struct device *dev = &idxd->pdev->dev;
@@@ -1320,21 -1381,16 +1384,16 @@@
                 dev_warn(dev, "Clients has claim on wq %d: %d\n",
                          wq->id, idxd_wq_refcount(wq));
   
+       idxd_wq_free_resources(wq);
         idxd_wq_unmap_portal(wq);
- 
         idxd_wq_drain(wq);
+       idxd_wq_free_irq(wq);
         idxd_wq_reset(wq);
- 
+       percpu_ref_exit(&wq->wq_active);
+       wq->type = IDXD_WQT_NONE;
         wq->client_count = 0;
   }
   
- void drv_disable_wq(struct idxd_wq *wq)
- {
-       mutex_lock(&wq->wq_lock);
-       __drv_disable_wq(wq);
-       mutex_unlock(&wq->wq_lock);
- }
- 
   int idxd_device_drv_probe(struct idxd_dev *idxd_dev)
   {
         struct idxd_device *idxd = idxd_dev_to_idxd(idxd_dev);
diff --combined drivers/dma/idxd/sysfs.c

index dfd549685c467ac796c76873b4dca559f33e622c,d482e708f0faf48b3f1f1711a61386022ab9ae9a..3f262a57441b47bda8a124462f48254b633d25d9
--- 1/drivers/dma/idxd/sysfs.c
--- 2/drivers/dma/idxd/sysfs.c
+++ b/drivers/dma/idxd/sysfs.c
@@@ -588,7 -588,7 +588,7 @@@ static ssize_t wq_mode_store(struct dev
         if (sysfs_streq(buf, "dedicated")) {
                 set_bit(WQ_FLAG_DEDICATED, &wq->flags);
                 wq->threshold = 0;
-       } else if (sysfs_streq(buf, "shared") && device_swq_supported(idxd)) {
+       } else if (sysfs_streq(buf, "shared")) {
                 clear_bit(WQ_FLAG_DEDICATED, &wq->flags);
         } else {
                 return -EINVAL;
@@@ -832,6 -832,7 +832,7 @@@ static ssize_t wq_name_store(struct dev
                              size_t count)
   {
         struct idxd_wq *wq = confdev_to_wq(dev);
+       char *input, *pos;
   
         if (wq->state != IDXD_WQ_DISABLED)
                 return -EPERM;
@@@ -846,9 -847,14 +847,14 @@@
         if (wq->type == IDXD_WQT_KERNEL && device_pasid_enabled(wq->idxd))
                 return -EOPNOTSUPP;
   
+       input = kstrndup(buf, count, GFP_KERNEL);
+       if (!input)
+               return -ENOMEM;
+ 
+       pos = strim(input);
         memset(wq->name, 0, WQ_NAME_SIZE + 1);
-       strncpy(wq->name, buf, WQ_NAME_SIZE);
-       strreplace(wq->name, '\n', '\0');
+       sprintf(wq->name, "%s", pos);
+       kfree(input);
         return count;
   }
   
@@@ -905,9 -911,6 +911,9 @@@ static ssize_t wq_max_transfer_size_sto
         u64 xfer_size;
         int rc;
   
+ +      if (!test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags))
+ +              return -EPERM;
+ +
         if (wq->state != IDXD_WQ_DISABLED)
                 return -EPERM;
   
@@@ -942,9 -945,6 +948,9 @@@ static ssize_t wq_max_batch_size_store(
         u64 batch_size;
         int rc;
   
+ +      if (!test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags))
+ +              return -EPERM;
+ +
         if (wq->state != IDXD_WQ_DISABLED)
                 return -EPERM;
author	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 29 May 2022 18:38:27 +0000 (11:38 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 29 May 2022 18:38:27 +0000 (11:38 -0700)
		1	2
Documentation/devicetree/bindings/dma/qcom,gpi.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/renesas/r9a06g032-clocks.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/at_xdmac.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/idxd/device.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/idxd/sysfs.c	patch \|	diff1 \|	diff2 \|	blob \| history