]> Git Repo - J-linux.git/commitdiff
Merge tag 's390-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <[email protected]>
Fri, 3 Jun 2022 20:57:50 +0000 (13:57 -0700)
committerLinus Torvalds <[email protected]>
Fri, 3 Jun 2022 20:57:50 +0000 (13:57 -0700)
Pull more s390 updates from Heiko Carstens:
 "Just a couple of small improvements, bug fixes and cleanups:

   - Add Eric Farman as maintainer for s390 virtio drivers.

   - Improve machine check handling, and avoid incorrectly injecting a
     machine check into a kvm guest.

   - Add cond_resched() call to gmap page table walker in order to avoid
     possible huge latencies. Also use non-quiesing sske instruction to
     speed up storage key handling.

   - Add __GFP_NORETRY to KEXEC_CONTROL_MEMORY_GFP so s390 behaves
     similar like common code.

   - Get sie control block address from correct stack slot in perf event
     code. This fixes potential random memory accesses.

   - Change uaccess code so that the exception handler sets the result
     of get_user() and __get_kernel_nofault() to zero in case of a
     fault. Until now this was done via input parameters for inline
     assemblies. Doing it via fault handling is what most or even all
     other architectures are doing.

   - Couple of other small cleanups and fixes"

* tag 's390-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/stack: add union to reflect kvm stack slot usages
  s390/stack: merge empty stack frame slots
  s390/uaccess: whitespace cleanup
  s390/uaccess: use __noreturn instead of __attribute__((noreturn))
  s390/uaccess: use exception handler to zero result on get_user() failure
  s390/uaccess: use symbolic names for inline assembler operands
  s390/mcck: isolate SIE instruction when setting CIF_MCCK_GUEST flag
  s390/mm: use non-quiescing sske for KVM switch to keyed guest
  s390/gmap: voluntarily schedule during key setting
  MAINTAINERS: Update s390 virtio-ccw
  s390/kexec: add __GFP_NORETRY to KEXEC_CONTROL_MEMORY_GFP
  s390/Kconfig.debug: fix indentation
  s390/Kconfig: fix indentation
  s390/perf: obtain sie_block from the right address
  s390: generate register offsets into pt_regs automatically
  s390: simplify early program check handler
  s390/crypto: fix scatterwalk_unmap() callers in AES-GCM

1  2 
MAINTAINERS
arch/s390/Kconfig
arch/s390/include/asm/kexec.h
arch/s390/mm/gmap.c

diff --combined MAINTAINERS
index 9516861da194367ee7898130983f1b9fbf092fb4,157bb82c65d1f0ade252438559139a577a89b759..81506da304251221f023d49c0ffc33c8a7c1274f
@@@ -382,7 -382,7 +382,7 @@@ F: include/acpi
  F:    tools/power/acpi/
  
  ACPI FOR ARM64 (ACPI/arm64)
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  M:    Hanjun Guo <[email protected]>
  M:    Sudeep Holla <[email protected]>
  L:    [email protected]
@@@ -820,7 -820,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 <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
@@@ -1044,6 -1044,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 <[email protected]>
  M:    Basavaraj Natikar <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1090,14 -1091,6 +1090,14 @@@ W:    https://ez.analog.com/linux-software
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 +ANALOG DEVICES INC AD3552R DRIVER
 +M:    Nuno Sá <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
 +F:    drivers/iio/dac/ad3552r.c
 +
  ANALOG DEVICES INC AD7293 DRIVER
  M:    Antoniu Miclaus <[email protected]>
  L:    [email protected]
  S:    Odd fixes
  F:    drivers/input/mouse/bcm5974.c
  
 -APPLE DART IOMMU DRIVER
 -M:    Sven Peter <[email protected]>
 -R:    Alyssa Rosenzweig <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
 -F:    drivers/iommu/apple-dart.c
 -
  APPLE PCIE CONTROLLER DRIVER
  M:    Alyssa Rosenzweig <[email protected]>
  M:    Marc Zyngier <[email protected]>
@@@ -1446,7 -1447,6 +1446,7 @@@ F:      drivers/media/i2c/aptina-pll.
  
  AQUACOMPUTER D5 NEXT PUMP SENSOR DRIVER
  M:    Aleksa Savic <[email protected]>
 +M:    Jack Doan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/aquacomputer_d5next.rst
@@@ -1526,7 -1526,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,11 -1837,7 +1834,11 @@@ 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,dart.yaml
 +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/nvmem/apple,efuses.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    Documentation/devicetree/bindings/power/apple*
@@@ -1847,18 -1846,14 +1847,18 @@@ F:   arch/arm64/boot/dts/apple
  F:    drivers/clk/clk-apple-nco.c
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
 +F:    drivers/iommu/apple-dart.c
  F:    drivers/irqchip/irq-apple-aic.c
  F:    drivers/mailbox/apple-mailbox.c
 +F:    drivers/nvme/host/apple.c
 +F:    drivers/nvmem/apple-efuses.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 <[email protected]>
@@@ -2135,18 -2130,6 +2135,18 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    arch/arm/mach-sa1100/include/mach/jornada720.h
  F:    arch/arm/mach-sa1100/jornada720.c
  
 +ARM/HPE GXP ARCHITECTURE
 +M:    Jean-Marie Verdun <[email protected]>
 +M:    Nick Hawkins <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 +F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
 +F:    arch/arm/boot/dts/hpe-bmc*
 +F:    arch/arm/boot/dts/hpe-gxp*
 +F:    arch/arm/mach-hpe/
 +F:    drivers/clocksource/timer-gxp.c
 +F:    drivers/watchdog/gxp-wdt.c
 +
  ARM/IGEP MACHINE SUPPORT
  M:    Enric Balletbo i Serra <[email protected]>
  M:    Javier Martinez Canillas <[email protected]>
@@@ -2589,7 -2572,7 +2589,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
@@@ -2661,7 -2644,6 +2661,7 @@@ L:      [email protected]
  S:    Maintained
  C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +B:    mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
@@@ -2962,7 -2944,7 +2962,7 @@@ N:      uniphie
  ARM/VERSATILE EXPRESS PLATFORM
  M:    Liviu Dudau <[email protected]>
  M:    Sudeep Holla <[email protected]>
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    */*/*/vexpress*
@@@ -3118,16 -3100,6 +3118,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 <[email protected]>
 +M:    Cédric Le Goater <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
 +F:    drivers/spi/spi-aspeed-smc.c
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -3598,9 -3570,8 +3598,9 @@@ M:      Andy Gospodarek <[email protected]
  L:    [email protected]
  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
@@@ -3770,23 -3741,9 +3770,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 <[email protected]>
 +M:    Anand Gore <[email protected]>
 +M:    Kursad Oney <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
 +L:    [email protected] (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 <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -3796,13 -3753,12 +3796,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 <[email protected]>
  M:    Ray Jui <[email protected]>
  M:    Scott Branden <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Maintained
  T:    git git://github.com/broadcom/mach-bcm
  F:    arch/arm/mach-bcm/
@@@ -3822,7 -3778,7 +3822,7 @@@ F:      arch/mips/include/asm/mach-bcm47xx/
  
  BROADCOM BCM4908 ETHERNET DRIVER
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
@@@ -3831,7 -3787,7 +3831,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
  
  BROADCOM BCM4908 PINMUX DRIVER
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
@@@ -3841,7 -3797,7 +3841,7 @@@ BROADCOM BCM5301X ARM ARCHITECTUR
  M:    Florian Fainelli <[email protected]>
  M:    Hauke Mehrtens <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[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*
@@@ -3852,7 -3808,7 +3852,7 @@@ F:      arch/arm/mach-bcm/bcm_5301x.
  BROADCOM BCM53573 ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[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*
@@@ -3860,7 -3816,7 +3860,7 @@@ F:      arch/arm/boot/dts/bcm53573
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3874,7 -3830,7 +3874,7 @@@ F:      drivers/usb/gadget/udc/bcm63xx_udc.
  
  BROADCOM BCM7XXX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3892,21 -3848,21 +3892,21 @@@ N:   bcm712
  BROADCOM BDC DRIVER
  M:    Al Cooper <[email protected]>
  L:    [email protected]
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bdc.yaml
  F:    drivers/usb/gadget/udc/bdc/
  
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/cpufreq/bmips-cpufreq.c
  
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3957,9 -3913,7 +3957,9 @@@ BROADCOM BNXT_EN 50 GIGABIT ETHERNET DR
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -3974,14 -3928,14 +3974,14 @@@ F:   drivers/net/wireless/broadcom/brcm80
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +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 <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
@@@ -3989,7 -3943,7 +3989,7 @@@ F:      drivers/i2c/busses/i2c-brcmstb.
  
  BROADCOM BRCMSTB UART DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
@@@ -3997,7 -3951,7 +3997,7 @@@ F:      drivers/tty/serial/8250/8250_bcm7271
  
  BROADCOM BRCMSTB USB EHCI DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
@@@ -4005,7 -3959,7 +4005,7 @@@ F:      drivers/usb/host/ehci-brcm.
  
  BROADCOM BRCMSTB USB PIN MAP DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
@@@ -4013,14 -3967,14 +4013,14 @@@ F:   drivers/usb/misc/brcmstb-usb-pinmap.
  
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
  BROADCOM ETHERNET PHY DRIVERS
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@@ -4031,7 -3985,7 +4031,7 @@@ F:      include/linux/brcmphy.
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
@@@ -4045,7 -3999,7 +4045,7 @@@ F:      include/linux/platform_data/mdio-bcm
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
  M:    Scott Branden <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4073,7 -4027,7 +4073,7 @@@ N:      stingra
  
  BROADCOM IPROC GBIT ETHERNET DRIVER
  M:    Rafał Miłecki <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,amac.yaml
@@@ -4082,7 -4036,7 +4082,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
  
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
  F:    drivers/gpio/gpio-bcm-kona.c
@@@ -4115,7 -4069,7 +4115,7 @@@ F:      drivers/firmware/broadcom/
  BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
  M:    Rafał Miłecki <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4131,7 -4085,7 +4131,7 @@@ F:      include/linux/bcma
  
  BROADCOM SPI DRIVER
  M:    Kamal Dasu <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
  F:    drivers/spi/spi-bcm-qspi.*
@@@ -4140,7 -4094,7 +4140,7 @@@ F:      drivers/spi/spi-iproc-qspi.
  
  BROADCOM STB AVS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
@@@ -4148,7 -4102,7 +4148,7 @@@ F:      drivers/cpufreq/brcmstb
  
  BROADCOM STB AVS TMON DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
@@@ -4156,7 -4110,7 +4156,7 @@@ F:      drivers/thermal/broadcom/brcmstb
  
  BROADCOM STB DPFE DRIVER
  M:    Markus Mayer <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
@@@ -4165,7 -4119,7 +4165,7 @@@ F:      drivers/memory/brcmstb_dpfe.
  BROADCOM STB NAND FLASH DRIVER
  M:    Brian Norris <[email protected]>
  M:    Kamal Dasu <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/nand/raw/brcmnand/
@@@ -4175,7 -4129,7 +4175,7 @@@ BROADCOM STB PCIE DRIVE
  M:    Jim Quinlan <[email protected]>
  M:    Nicolas Saenz Julienne <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
@@@ -4183,7 -4137,7 +4183,7 @@@ F:      drivers/pci/controller/pcie-brcmstb.
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
@@@ -4200,7 -4154,7 +4200,7 @@@ F:      drivers/net/ethernet/broadcom/tg3.
  
  BROADCOM VK DRIVER
  M:    Scott Branden <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    drivers/misc/bcm-vk/
  F:    include/uapi/linux/misc/bcm_vk.h
@@@ -4418,6 -4372,7 +4418,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
@@@ -4588,8 -4543,8 +4588,8 @@@ F:      drivers/power/supply/cw2015_battery.
  
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <[email protected]>
 -M:    Jeff Layton <[email protected]>
  M:    Xiubo Li <[email protected]>
 +R:    Jeff Layton <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://ceph.com/
@@@ -4599,9 -4554,9 +4599,9 @@@ F:      include/linux/crush
  F:    net/ceph/
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
 -M:    Jeff Layton <[email protected]>
  M:    Xiubo Li <[email protected]>
  M:    Ilya Dryomov <[email protected]>
 +R:    Jeff Layton <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://ceph.com/
@@@ -4616,9 -4571,7 +4616,9 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -4663,7 -4616,6 +4663,7 @@@ F:      Documentation/dev-tools/checkpatch.r
  
  CHINESE DOCUMENTATION
  M:    Alex Shi <[email protected]>
 +M:    Yanteng Si <[email protected]>
  S:    Maintained
  F:    Documentation/translations/zh_CN/
  
@@@ -4737,12 -4689,10 +4737,12 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
  M:    James Schulman <[email protected]>
  M:    David Rhodes <[email protected]>
  M:    Lucas Tanure <[email protected]>
 +M:    Richard Fitzgerald <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  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*
  
@@@ -5043,7 -4993,6 +5043,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 <[email protected]>
@@@ -5072,15 -5021,11 +5072,15 @@@ M:   Johannes Weiner <[email protected]
  M:    Michal Hocko <[email protected]>
  M:    Roman Gushchin <[email protected]>
  M:    Shakeel Butt <[email protected]>
 +R:    Muchun Song <[email protected]>
  L:    [email protected]
  L:    [email protected]
  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 <[email protected]>
@@@ -5102,6 -5047,12 +5102,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/corsair-psu.rst
  F:    drivers/hwmon/corsair-psu.c
  
 -COSA/SRP SYNC SERIAL DRIVER
 -M:    Jan "Yenya" Kasprzak <[email protected]>
 -S:    Maintained
 -W:    http://www.fi.muni.cz/~kas/cosa/
 -F:    drivers/net/wan/cosa*
 -
  COUNTER SUBSYSTEM
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
@@@ -5178,7 -5129,7 +5178,7 @@@ F:      arch/x86/kernel/cpuid.
  F:    arch/x86/kernel/msr.c
  
  CPUIDLE DRIVER - ARM BIG LITTLE
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  M:    Daniel Lezcano <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -5198,7 -5149,7 +5198,7 @@@ F:      drivers/cpuidle/cpuidle-exynos.
  F:    include/linux/platform_data/cpuidle-exynos.h
  
  CPUIDLE DRIVER - ARM PSCI
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  M:    Sudeep Holla <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -5283,14 -5234,6 +5283,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 <[email protected]>
 +M:    Ondrej Ille <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
 +F:    drivers/net/can/ctucanfd/
 +
  CW1200 WLAN driver
  M:    Solomon Peachy <[email protected]>
  S:    Maintained
@@@ -5493,7 -5436,6 +5493,7 @@@ F:      net/ax25/sysctl_net_ax25.
  
  DATA ACCESS MONITOR
  M:    SeongJae Park <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
@@@ -5972,7 -5914,7 +5972,7 @@@ R:      Benjamin Gaignard <benjamin.gaignard
  R:    Liam Mark <[email protected]>
  R:    Laura Abbott <[email protected]>
  R:    Brian Starkey <[email protected]>
 -R:    John Stultz <j[email protected]>
 +R:    John Stultz <j[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/translations/it_IT
  
 +DOCUMENTATION/JAPANESE
 +R:    Akira Yokosawa <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/translations/ja_JP
 +
  DONGWOON DW9714 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -6319,9 -6255,8 +6319,9 @@@ F:      drivers/gpu/drm/tiny/panel-mipi-dbi.
  
  DRM DRIVER FOR MSM ADRENO GPU
  M:    Rob Clark <[email protected]>
 -M:    Sean Paul <[email protected]>
 -R:    Abhinav Kumar <[email protected]>
 +M:    Abhinav Kumar <[email protected]>
 +M:    Dmitry Baryshkov <[email protected]>
 +R:    Sean Paul <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -6374,11 -6309,6 +6374,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 <[email protected]>
 +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 <[email protected]>
  S:    Maintained
@@@ -6492,11 -6422,6 +6492,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 <[email protected]>
 +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 <[email protected]>
  S:    Maintained
@@@ -6616,7 -6541,6 +6616,7 @@@ R:      Jonas Karlman <[email protected]
  R:    Jernej Skrabec <[email protected]>
  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
@@@ -6660,7 -6584,7 +6660,7 @@@ F:      drivers/gpu/drm/gma500
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
  M:    Tian Tao  <[email protected]>
 -R:    John Stultz <j[email protected]>
 +R:    John Stultz <j[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
  L:    [email protected]
@@@ -7456,6 -7380,7 +7456,6 @@@ L:      [email protected]
  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
@@@ -7533,7 -7458,6 +7533,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/*
@@@ -7572,7 -7496,7 +7572,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
  
@@@ -7727,7 -7651,6 +7727,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 +M:    Russ Weight <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -7796,7 -7719,7 +7796,7 @@@ R:      Tom Rix <[email protected]
  L:    [email protected]
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git
  F:    Documentation/devicetree/bindings/fpga/
  F:    Documentation/driver-api/fpga/
  F:    Documentation/fpga/
@@@ -8186,7 -8109,7 +8186,7 @@@ M:      Ingo Molnar <[email protected]
  R:    Peter Zijlstra <[email protected]>
  R:    Darren Hart <[email protected]>
  R:    Davidlohr Bueso <[email protected]>
 -R:    André Almeida <andrealmeid@collabora.com>
 +R:    André Almeida <andrealmeid@igalia.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -8459,7 -8382,7 +8459,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  M:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  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/
  S:    Maintained
  F:    block/partitions/efi.*
  
 -H8/300 ARCHITECTURE
 -M:    Yoshinori Sato <[email protected]>
 -L:    [email protected] (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 <[email protected]>
  S:    Supported
@@@ -8815,14 -8749,6 +8815,14 @@@ F:    drivers/hid/hid-sensor-
  F:    drivers/iio/*/hid-*
  F:    include/linux/hid-sensor-*
  
 +HID WACOM DRIVER
 +M:    Ping Cheng <[email protected]>
 +M:    Jason Gerecke  <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/wacom.h
 +F:    drivers/hid/wacom_*
 +
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
@@@ -8838,6 -8764,7 +8838,6 @@@ F:      kernel/time/timer_*.
  HIGH-SPEED SCC DRIVER FOR AX.25
  L:    [email protected]
  S:    Orphan
 -F:    drivers/net/hamradio/dmascc.c
  F:    drivers/net/hamradio/scc.c
  
  HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
@@@ -8918,7 -8845,7 +8918,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/hisilicon/
  
  HIKEY960 ONBOARD USB GPIO HUB DRIVER
 -M:    John Stultz <j[email protected]>
 +M:    John Stultz <j[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/hisi_hikey_usb.c
@@@ -9074,7 -9001,7 +9074,7 @@@ S:      Maintaine
  F:    drivers/input/touchscreen/htcpen.c
  
  HTS221 TEMPERATURE-HUMIDITY IIO DRIVER
 -M:    Lorenzo Bianconi <lorenzo[email protected]>
 +M:    Lorenzo Bianconi <lorenzo@kernel.org>
  L:    [email protected]
  S:    Maintained
  W:    http://www.st.com/
@@@ -9087,20 -9014,16 +9087,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 <[email protected]>
 +M:    Muchun Song <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -9342,13 -9265,13 +9342,13 @@@ F:   drivers/i2c/i2c-stub.
  I3C DRIVER FOR CADENCE I3C MASTER IP
  M:    Przemysław Gaj <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
 +F:    Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml
  F:    drivers/i3c/master/i3c-master-cdns.c
  
  I3C DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Vitor Soares <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
 +F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
  F:    drivers/i3c/master/dw*
  
  I3C SUBSYSTEM
@@@ -9936,14 -9859,6 +9936,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 <[email protected]>
 +R:    Ashok Raj <[email protected]>
 +R:    Tony Luck <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/intel/ifs
 +F:    include/trace/events/intel_ifs.h
 +
  INTEL INTEGRATED SENSOR HUB DRIVER
  M:    Srinivas Pandruvada <[email protected]>
  M:    Jiri Kosina <[email protected]>
@@@ -10069,7 -9984,6 +10069,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/*
@@@ -10214,7 -10128,7 +10214,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:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@@ -10323,6 -10237,8 +10323,6 @@@ F:   drivers/net/ethernet/sgi/ioc3-eth.
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <[email protected]>
  M:    Darrick J. Wong <[email protected]>
 -M:    [email protected]
 -M:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -10850,8 -10766,6 +10850,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 <[email protected]>
@@@ -10866,12 -10780,9 +10866,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/
  
@@@ -10944,15 -10855,6 +10944,15 @@@ S: Supporte
  F:    include/keys/trusted_tee.h
  F:    security/keys/trusted-keys/trusted_tee.c
  
 +KEYS-TRUSTED-CAAM
 +M:    Ahmad Fatoum <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    include/keys/trusted_caam.h
 +F:    security/keys/trusted-keys/trusted_caam.c
 +
  KEYS/KEYRINGS
  M:    David Howells <[email protected]>
  M:    Jarkko Sakkinen <[email protected]>
@@@ -11007,7 -10909,6 +11007,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 <[email protected]>
@@@ -11446,7 -11347,7 +11446,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 <[email protected]>
  M:    Miroslav Benes <[email protected]>
  M:    Petr Mladek <[email protected]>
@@@ -11457,9 -11358,10 +11457,9 @@@ T:  git git://git.kernel.org/pub/scm/lin
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    Documentation/livepatch/
  F:    arch/powerpc/include/asm/livepatch.h
 -F:    arch/s390/include/asm/livepatch.h
 -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/
@@@ -11925,16 -11827,9 +11925,16 @@@ MARVELL XENON MMC/SD/SDIO HOST CONTROLL
  M:    Hu Ziji <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +M:    Abhijit Ayarekar <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/marvell/octeon_ep
 +
  MATROX FRAMEBUFFER DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -12078,7 -11973,6 +12078,7 @@@ M:   Krzysztof Kozlowski <krzysztof.kozlo
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +B:    mailto:[email protected]
  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
@@@ -12090,7 -11984,6 +12090,7 @@@ M:   Krzysztof Kozlowski <krzysztof.kozlo
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77693.yaml
@@@ -12260,7 -12153,7 +12260,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
  L:    [email protected]
  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
@@@ -12465,7 -12358,7 +12465,7 @@@ MEDIATEK I2C CONTROLLER DRIVE
  M:    Qii Wang <[email protected]>
  L:    [email protected]
  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
@@@ -12478,9 -12371,10 +12478,9 @@@ F:  drivers/iommu/mtk_iommu
  F:    include/dt-bindings/memory/mt*-port.h
  
  MEDIATEK JPEG DRIVER
 -M:    Rick Chang <[email protected]>
  M:    Bin Liu <[email protected]>
  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
@@@ -12496,7 -12390,7 +12496,7 @@@ MEDIATEK MEDIA DRIVE
  M:    Tiffany Lin <[email protected]>
  M:    Andrew-CT Chen <[email protected]>
  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/
@@@ -12583,17 -12477,6 +12583,17 @@@ S: Maintaine
  F:    drivers/net/dsa/mt7530.*
  F:    net/dsa/tag_mtk.c
  
 +MEDIATEK T7XX 5G WWAN MODEM DRIVER
 +M:    Chandrashekar Devegowda <[email protected]>
 +M:    Intel Corporation <[email protected]>
 +R:    Chiranjeevi Rapolu <[email protected]>
 +R:    Liu Haijun <[email protected]>
 +R:    M Chetan Kumar <[email protected]>
 +R:    Ricardo Martinez <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wwan/t7xx/
 +
  MEDIATEK USB3 DRD IP DRIVER
  M:    Chunfeng Yun <[email protected]>
  L:    [email protected]
@@@ -12794,7 -12677,6 +12794,7 @@@ MEMORY CONTROLLER DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  S:    Maintained
 +B:    mailto:[email protected]
  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/
@@@ -12913,7 -12795,7 +12913,7 @@@ F:   arch/arm64/boot/dts/marvell/armada-3
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
 -R:    Hemant Kumar <[email protected]>
 +R:    Hemant Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -13023,13 -12905,6 +13023,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 <[email protected]>
 +R:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/microchip_t1.c
 +
  MICROCHIP LAN743X ETHERNET DRIVER
  M:    Bryan Whitehead <[email protected]>
  M:    [email protected]
@@@ -13083,7 -12958,7 +13083,7 @@@ M:   Claudiu Beznea <claudiu.beznea@micro
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/pwm/atmel-pwm.txt
 +F:    Documentation/devicetree/bindings/pwm/atmel,at91sam-pwm.yaml
  F:    drivers/pwm/pwm-atmel.c
  
  MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
  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 <[email protected]>
@@@ -13422,7 -13297,7 +13422,7 @@@ F:   drivers/net/phy/motorcomm.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
 -F:    Documentation/driver-api/serial/moxa-smartio.rst
 +F:    Documentation/driver-api/tty/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -13655,21 -13530,12 +13655,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 <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
 +F:    drivers/hwmon/nct6775-i2c.c
  
  NETDEVSIM
  M:    Jakub Kicinski <[email protected]>
@@@ -13759,7 -13625,6 +13759,7 @@@ F:   net/core/drop_monitor.
  
  NETWORKING DRIVERS
  M:    "David S. Miller" <[email protected]>
 +M:    Eric Dumazet <[email protected]>
  M:    Jakub Kicinski <[email protected]>
  M:    Paolo Abeni <[email protected]>
  L:    [email protected]
@@@ -13807,7 -13672,6 +13807,7 @@@ F:   tools/testing/selftests/drivers/net/
  
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
 +M:    Eric Dumazet <[email protected]>
  M:    Jakub Kicinski <[email protected]>
  M:    Paolo Abeni <[email protected]>
  L:    [email protected]
@@@ -13902,7 -13766,6 +13902,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]
@@@ -14330,7 -14193,7 +14330,7 @@@ R:   NXP Linux Team <[email protected]
  L:    [email protected]
  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 <[email protected]>
@@@ -14355,7 -14218,7 +14355,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 <[email protected]>
  S:    Supported
  F:    tools/objtool/
@@@ -14503,6 -14366,7 +14503,6 @@@ F:   arch/arm/*omap*/*pm
  F:    drivers/cpufreq/omap-cpufreq.c
  
  OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -M:    Rajendra Nayak <[email protected]>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14528,7 -14392,6 +14528,7 @@@ F:   arch/arm/boot/dts/am335x-nano.dt
  
  OMAP1 SUPPORT
  M:    Aaro Koskinen <[email protected]>
 +M:    Janusz Krzysztofik <[email protected]>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14964,19 -14827,6 +14964,19 @@@ F: Documentation/core-api/padata.rs
  F:    include/linux/padata.h
  F:    kernel/padata.c
  
 +PAGE CACHE
 +M:    Matthew Wilcox (Oracle) <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Ilias Apalodimas <[email protected]>
@@@ -15305,7 -15155,7 +15305,7 @@@ F:   drivers/pci/controller/pci-v3-semi.
  
  PCI ENDPOINT SUBSYSTEM
  M:    Kishon Vijay Abraham I <[email protected]>
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  R:    Krzysztof Wilczyński <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -15368,7 -15218,7 +15368,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-xgene-msi.c
  
  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  R:    Rob Herring <[email protected]>
  R:    Krzysztof Wilczyński <[email protected]>
  L:    [email protected]
@@@ -15509,7 -15359,7 +15509,7 @@@ PCIE DRIVER FOR SOCIONEXT UNIPHIE
  M:    Kunihiko Hayashi <[email protected]>
  L:    [email protected]
  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
@@@ -15619,8 -15469,7 +15619,8 @@@ F:   tools/perf
  PERFORMANCE EVENTS TOOLING ARM64
  R:    John Garry <[email protected]>
  R:    Will Deacon <[email protected]>
 -R:    Mathieu Poirier <[email protected]>
 +R:    James Clark <[email protected]>
 +R:    Mike Leach <[email protected]>
  R:    Leo Yan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  S:    Maintained
  C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +B:    mailto:[email protected]
  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/
@@@ -15921,7 -15769,7 +15921,7 @@@ F:   include/linux/dtpm.
  
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <[email protected]>
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/firmware/psci/
@@@ -16009,9 -15857,7 +16009,9 @@@ F:   kernel/printk
  PRINTK INDEXING
  R:    Chris Down <[email protected]>
  S:    Maintained
 +F:    Documentation/core-api/printk-index.rst
  F:    kernel/printk/index.c
 +K:    printk_index
  
  PROC FILESYSTEM
  L:    [email protected]
@@@ -16115,6 -15961,7 +16115,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
@@@ -16125,12 -15972,6 +16125,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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wireless/purelifi/plfxlc/
 +
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <[email protected]>
  L:    [email protected]       (subscribers-only)
@@@ -16598,7 -16439,6 +16598,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
  S:    Maintained
  F:    arch/mips/boot/dts/ralink/mt7621*
  
 +RALINK PINCTRL DRIVER
 +M:    Arınç ÜNAL <[email protected]>
 +M:    Sergio Paracuellos <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pinctrl/ralink/
 +
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <[email protected]>
  M:    Helmut Schaa <[email protected]>
@@@ -17016,14 -16849,6 +17016,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
  F:    drivers/iio/adc/rzg2l_adc.c
  
 +RENESAS RZ/N1 RTC CONTROLLER DRIVER
 +M:    Miquel Raynal <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml
 +F:    drivers/rtc/rtc-rzn1.c
 +
  RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
  M:    Miquel Raynal <[email protected]>
  L:    [email protected]
@@@ -17500,7 -17325,6 +17500,7 @@@ M:   Krzysztof Kozlowski <krzysztof.kozlo
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/sound/samsung*
  F:    sound/soc/samsung/
  
@@@ -17545,7 -17369,6 +17545,7 @@@ M:   Bartlomiej Zolnierkiewicz <b.zolnier
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
  F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
  F:    Documentation/devicetree/bindings/mfd/samsung,s5m*.yaml
@@@ -17683,7 -17506,6 +17683,7 @@@ R:   Steven Rostedt <[email protected]
  R:    Ben Segall <[email protected]> (CONFIG_CFS_BANDWIDTH)
  R:    Mel Gorman <[email protected]> (CONFIG_NUMA_BALANCING)
  R:    Daniel Bristot de Oliveira <[email protected]> (SCHED_DEADLINE)
 +R:    Valentin Schneider <[email protected]> (TOPOLOGY)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -17827,7 -17649,7 +17827,7 @@@ K:   \bTIF_SECCOMP\
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
  M:    Al Cooper <[email protected]>
 -R:    Broadcom Kernel Team <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-brcmstb*
@@@ -18158,8 -17980,8 +18158,8 @@@ F:   drivers/platform/x86/touchscreen_dmi
  SILICON LABS WIRELESS DRIVERS (for WFxxx series)
  M:    Jérôme Pouiller <[email protected]>
  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 <[email protected]>
@@@ -18272,7 -18094,6 +18272,7 @@@ M:   Joonsoo Kim <[email protected]
  M:    Andrew Morton <[email protected]>
  M:    Vlastimil Babka <[email protected]>
  R:    Roman Gushchin <[email protected]>
 +R:    Hyeonggon Yoo <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
@@@ -18308,7 -18129,7 +18308,7 @@@ F:   drivers/net/ethernet/smsc/smc91x.
  
  SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
  M:    Mark Rutland <[email protected]>
 -M:    Lorenzo Pieralisi <l[email protected]>
 +M:    Lorenzo Pieralisi <l[email protected]>
  M:    Sudeep Holla <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -18805,7 -18626,7 +18805,7 @@@ S:   Maintaine
  F:    arch/alpha/kernel/srm_env.c
  
  ST LSM6DSx IMU IIO DRIVER
 -M:    Lorenzo Bianconi <lorenzo[email protected]>
 +M:    Lorenzo Bianconi <lorenzo@kernel.org>
  L:    [email protected]
  S:    Maintained
  W:    http://www.st.com/
@@@ -18962,7 -18783,7 +18962,7 @@@ F:   include/dt-bindings/reset/starfive-j
  
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <[email protected]>
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Jason Baron <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Ard Biesheuvel <[email protected]>
@@@ -19046,26 -18867,12 +19046,26 @@@ L:        [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
 +SUNPLUS ETHERNET DRIVER
 +M:    Wells Lu <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
  F:    drivers/nvmem/sunplus-ocotp.c
  
 +SUNPLUS PWM DRIVER
 +M:    Hammer Hsieh <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pwm/sunplus,sp7021-pwm.yaml
 +F:    drivers/pwm/pwm-sunplus.c
 +
  SUNPLUS RTC DRIVER
  M:    Vincent Shih <[email protected]>
  L:    [email protected]
@@@ -19086,13 -18893,6 +19086,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
  F:    drivers/tty/serial/sunplus-uart.c
  
 +SUNPLUS WATCHDOG DRIVER
 +M:    Xiantao Hu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/watchdog/sunplus,sp7021-wdt.yaml
 +F:    drivers/watchdog/sunplus_wdt.c
 +
  SUPERH
  M:    Yoshinori Sato <[email protected]>
  M:    Rich Felker <[email protected]>
@@@ -19238,7 -19038,6 +19238,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  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
@@@ -19733,7 -19532,6 +19733,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
@@@ -19986,7 -19784,7 +19986,7 @@@ F:   drivers/net/wireless/ti
  F:    include/linux/wl12xx.h
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 -M:    John Stultz <j[email protected]>
 +M:    John Stultz <j[email protected]>
  M:    Thomas Gleixner <[email protected]>
  R:    Stephen Boyd <[email protected]>
  L:    [email protected]
@@@ -20033,7 -19831,6 +20033,7 @@@ F:   drivers/media/usb/tm6000
  TMIO/SDHI MMC DRIVER
  M:    Wolfram Sang <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/renesas_sdhi*
  F:    drivers/mmc/host/tmio_mmc*
@@@ -20043,7 -19840,6 +20043,7 @@@ TMP401 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
@@@ -20157,8 -19953,8 +20157,8 @@@ M:   Ingo Molnar <[email protected]
  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
@@@ -20389,6 -20185,14 +20389,6 @@@ F:  drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  F:    include/uapi/linux/cdrom.h
  
 -UNISYS S-PAR DRIVERS
 -M:    David Kershner <[email protected]>
 -L:    [email protected] (Unisys internal)
 -S:    Supported
 -F:    drivers/staging/unisys/
 -F:    drivers/visorbus/
 -F:    include/linux/visorbus.h
 -
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  R:    Alim Akhtar <[email protected]>
  R:    Avri Altman <[email protected]>
@@@ -20719,6 -20523,7 +20719,6 @@@ F:   drivers/usb/host/uhci
  
  USB VIDEO CLASS
  M:    Laurent Pinchart <[email protected]>
 -L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
  W:    http://www.ideasonboard.org/uvc/
@@@ -21057,6 -20862,7 +21057,7 @@@ F:   include/uapi/linux/virtio_crypto.
  VIRTIO DRIVERS FOR S390
  M:    Cornelia Huck <[email protected]>
  M:    Halil Pasic <[email protected]>
+ M:    Eric Farman <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/vme.rst
 -F:    drivers/staging/vme/
 +F:    drivers/staging/vme_user/
  F:    drivers/vme/
  F:    include/linux/vme*
  
@@@ -21629,15 -21435,6 +21630,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 <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +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 <[email protected]>
  L:    [email protected]
@@@ -21696,7 -21493,6 +21697,7 @@@ K:   (?:\b|_)xdp(?:\b|_
  XDP SOCKETS (AF_XDP)
  M:    Björn Töpel <[email protected]>
  M:    Magnus Karlsson <[email protected]>
 +M:    Maciej Fijalkowski <[email protected]>
  R:    Jonathan Lemon <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -21801,6 -21597,7 +21802,6 @@@ F:   drivers/xen/*swiotlb
  XFS FILESYSTEM
  C:    irc://irc.oftc.net/xfs
  M:    Darrick J. Wong <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://xfs.org/
@@@ -21830,7 -21627,7 +21831,7 @@@ M:   Appana Durga Kedareswara rao <appana
  R:    Naga Sureshkumar Relli <[email protected]>
  L:    [email protected]
  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
@@@ -21854,12 -21651,6 +21855,12 @@@ F: drivers/misc/Makefil
  F:    drivers/misc/xilinx_sdfec.c
  F:    include/uapi/misc/xilinx_sdfec.h
  
 +XILINX PWM DRIVER
 +M:    Sean Anderson <[email protected]>
 +S:    Maintained
 +F:    drivers/pwm/pwm-xilinx.c
 +F:    include/clocksource/timer-xilinx.h
 +
  XILINX UARTLITE SERIAL DRIVER
  M:    Peter Korsgaard <[email protected]>
  L:    [email protected]
diff --combined arch/s390/Kconfig
index b17239ae7bd4ad780e08c8cb671bd3f708a1a304,543e859905df0e0a07ea936b6d9e9cf6ed10ad6a..b1a88f6cc3494bb058b11e5ab1391c7d881ea48b
@@@ -418,6 -418,9 +418,6 @@@ config COMPA
          (and some other stuff like libraries and such) is needed for
          executing 31 bit applications.  It is safe to say "Y".
  
 -config SYSVIPC_COMPAT
 -      def_bool y if COMPAT && SYSVIPC
 -
  config SMP
        def_bool y
  
@@@ -583,6 -586,7 +583,6 @@@ endchoic
  
  config RELOCATABLE
        bool "Build a relocatable kernel"
 -      select MODULE_REL_CRCS if MODVERSIONS
        default y
        help
          This builds a kernel image that retains relocation information
@@@ -732,11 -736,11 +732,11 @@@ config VFIO_A
        depends on S390_AP_IOMMU && VFIO_MDEV && KVM
        depends on ZCRYPT
        help
-               This driver grants access to Adjunct Processor (AP) devices
-               via the VFIO mediated device interface.
+         This driver grants access to Adjunct Processor (AP) devices
+         via the VFIO mediated device interface.
  
-               To compile this driver as a module, choose M here: the module
-               will be called vfio_ap.
+         To compile this driver as a module, choose M here: the module
+         will be called vfio_ap.
  
  endmenu
  
index 63098df81c9f2a32406c76a8e78d450399697e65,9df3b4d647242c674b88d902f4d04ec831b0c873..649ecdcc873453c3ad57b4417ffa8d49fac29434
@@@ -9,8 -9,6 +9,8 @@@
  #ifndef _S390_KEXEC_H
  #define _S390_KEXEC_H
  
 +#include <linux/module.h>
 +
  #include <asm/processor.h>
  #include <asm/page.h>
  #include <asm/setup.h>
@@@ -31,7 -29,7 +31,7 @@@
  #define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31)
  
  /* Allocate control page with GFP_DMA */
- #define KEXEC_CONTROL_MEMORY_GFP GFP_DMA
+ #define KEXEC_CONTROL_MEMORY_GFP (GFP_DMA | __GFP_NORETRY)
  
  /* Maximum address we can use for the crash control pages */
  #define KEXEC_CRASH_CONTROL_MEMORY_LIMIT (-1UL)
@@@ -85,12 -83,4 +85,12 @@@ struct kimage_arch 
  extern const struct kexec_file_ops s390_kexec_image_ops;
  extern const struct kexec_file_ops s390_kexec_elf_ops;
  
 +#ifdef CONFIG_KEXEC_FILE
 +struct purgatory_info;
 +int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
 +                                   Elf_Shdr *section,
 +                                   const Elf_Shdr *relsec,
 +                                   const Elf_Shdr *symtab);
 +#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add
 +#endif
  #endif /*_S390_KEXEC_H */
diff --combined arch/s390/mm/gmap.c
index 1ac73917a8d399ef8335744a056252032120aacd,f3694f6df8b77801396ce7092f1485633dabb3ca..b8ae4a4aa2ba46388eaaba72a02f1666f1d56324
@@@ -1183,7 -1183,6 +1183,7 @@@ EXPORT_SYMBOL_GPL(gmap_read_table)
  static inline void gmap_insert_rmap(struct gmap *sg, unsigned long vmaddr,
                                    struct gmap_rmap *rmap)
  {
 +      struct gmap_rmap *temp;
        void __rcu **slot;
  
        BUG_ON(!gmap_is_shadow(sg));
        if (slot) {
                rmap->next = radix_tree_deref_slot_protected(slot,
                                                        &sg->guest_table_lock);
 +              for (temp = rmap->next; temp; temp = temp->next) {
 +                      if (temp->raddr == rmap->raddr) {
 +                              kfree(rmap);
 +                              return;
 +                      }
 +              }
                radix_tree_replace_slot(&sg->host_to_rmap, slot, rmap);
        } else {
                rmap->next = NULL;
@@@ -2608,6 -2601,18 +2608,18 @@@ static int __s390_enable_skey_pte(pte_
        return 0;
  }
  
+ /*
+  * Give a chance to schedule after setting a key to 256 pages.
+  * We only hold the mm lock, which is a rwsem and the kvm srcu.
+  * Both can sleep.
+  */
+ static int __s390_enable_skey_pmd(pmd_t *pmd, unsigned long addr,
+                                 unsigned long next, struct mm_walk *walk)
+ {
+       cond_resched();
+       return 0;
+ }
  static int __s390_enable_skey_hugetlb(pte_t *pte, unsigned long addr,
                                      unsigned long hmask, unsigned long next,
                                      struct mm_walk *walk)
        end = start + HPAGE_SIZE - 1;
        __storage_key_init_range(start, end);
        set_bit(PG_arch_1, &page->flags);
+       cond_resched();
        return 0;
  }
  
  static const struct mm_walk_ops enable_skey_walk_ops = {
        .hugetlb_entry          = __s390_enable_skey_hugetlb,
        .pte_entry              = __s390_enable_skey_pte,
+       .pmd_entry              = __s390_enable_skey_pmd,
  };
  
  int s390_enable_skey(void)
This page took 0.169515 seconds and 4 git commands to generate.