Merge tag 'powerpc-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

Pull powerpc updates from Michael Ellerman:

 - Enable STRICT_KERNEL_RWX for Freescale 85xx platforms.

 - Activate CONFIG_STRICT_KERNEL_RWX by default, while still allowing it
   to be disabled.

 - Add support for out-of-line static calls on 32-bit.

 - Fix oopses doing bpf-to-bpf calls when STRICT_KERNEL_RWX is enabled.

 - Fix boot hangs on e5500 due to stale value in ESR passed to
   do_page_fault().

 - Fix several bugs on pseries in handling of device tree cache
   information for hotplugged CPUs, and/or during partition migration.

 - Various other small features and fixes.

Thanks to Alexey Kardashevskiy, Alistair Popple, Anatolij Gustschin,
Andrew Donnellan, Athira Rajeev, Bixuan Cui, Bjorn Helgaas, Cédric Le
Goater, Christophe Leroy, Daniel Axtens, Daniel Henrique Barboza, Denis
Kirjanov, Fabiano Rosas, Frederic Barrat, Gustavo A.  R.  Silva, Hari
Bathini, Jacques de Laval, Joel Stanley, Kai Song, Kajol Jain, Laurent
Vivier, Leonardo Bras, Madhavan Srinivasan, Nathan Chancellor, Nathan
Lynch, Naveen N.  Rao, Nicholas Piggin, Nick Desaulniers, Niklas
Schnelle, Oliver O'Halloran, Rob Herring, Russell Currey, Srikar
Dronamraju, Stan Johnson, Tyrel Datwyler, Uwe Kleine-König, Vasant
Hegde, Wan Jiabing, and Xiaoming Ni,

* tag 'powerpc-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (73 commits)
  powerpc/8xx: Fix Oops with STRICT_KERNEL_RWX without DEBUG_RODATA_TEST
  powerpc/32e: Ignore ESR in instruction storage interrupt handler
  powerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during module unload
  powerpc: Don't provide __kernel_map_pages() without ARCH_SUPPORTS_DEBUG_PAGEALLOC
  MAINTAINERS: Update powerpc KVM entry
  powerpc/xmon: fix task state output
  powerpc/44x/fsp2: add missing of_node_put
  powerpc/dcr: Use cmplwi instead of 3-argument cmpli
  KVM: PPC: Tick accounting should defer vtime accounting 'til after IRQ handling
  powerpc/security: Use a mutex for interrupt exit code patching
  powerpc/83xx/mpc8349emitx: Make mcu_gpiochip_remove() return void
  powerpc/fsl_booke: Fix setting of exec flag when setting TLBCAMs
  powerpc/book3e: Fix set_memory_x() and set_memory_nx()
  powerpc/nohash: Fix __ptep_set_access_flags() and ptep_set_wrprotect()
  powerpc/bpf: Fix write protecting JIT code
  selftests/powerpc: Use date instead of EPOCHSECONDS in mitigation-patching.sh
  powerpc/64s/interrupt: Fix check_return_regs_valid() false positive
  powerpc/boot: Set LC_ALL=C in wrapper script
  powerpc/64s: Default to 64K pages for 64 bit book3s
  Revert "powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC"
  ...

diff --combined MAINTAINERS
index 886639f1fa0bdc920255e27cc817b910ce8dd88d,fbfd3345c40d539e8e04762f4cbea84756ac3b5d..409ab17a22647616f4cd7204d6fedeeb93a2365c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -334,7 -334,7 +334,7 @@@ F: drivers/platform/x86/acer-wmi.
  
  ACPI
  M:    "Rafael J. Wysocki" <[email protected]>
 -M:    Len Brown <[email protected]>
 +R:    Len Brown <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://01.org/linux-acpi
@@@ -355,7 -355,7 +355,7 @@@ F: tools/power/acpi
  
  ACPI APEI
  M:    "Rafael J. Wysocki" <[email protected]>
 -M:    Len Brown <[email protected]>
 +R:    Len Brown <[email protected]>
  R:    James Morse <[email protected]>
  R:    Tony Luck <[email protected]>
  R:    Borislav Petkov <[email protected]>
@@@ -378,6 -378,14 +378,6 @@@ F:        drivers/acpi/acpica
  F:    include/acpi/
  F:    tools/power/acpi/
  
 -ACPI FAN DRIVER
 -M:    Zhang Rui <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    https://01.org/linux-acpi
 -B:    https://bugzilla.kernel.org
 -F:    drivers/acpi/fan.c
 -
  ACPI FOR ARM64 (ACPI/arm64)
  M:    Lorenzo Pieralisi <[email protected]>
  M:    Hanjun Guo <[email protected]>
@@@ -393,12 -401,6 +393,12 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/platform/x86/i2c-multi-instantiate.c
  
 +ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
 +M:    Sudeep Holla <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mailbox/pcc.c
 +
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
@@@ -412,14 -414,21 +412,14 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/acpi/pmic/
  
  ACPI THERMAL DRIVER
 -M:    Zhang Rui <[email protected]>
 +M:    Rafael J. Wysocki <[email protected]>
 +R:    Zhang Rui <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
  F:    drivers/acpi/*thermal*
  
 -ACPI VIDEO DRIVER
 -M:    Zhang Rui <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    https://01.org/linux-acpi
 -B:    https://bugzilla.kernel.org
 -F:    drivers/acpi/acpi_video.c
 -
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <[email protected]>
  L:    [email protected]
@@@ -581,12 -590,6 +581,12 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/platform/x86/adv_swbutton.c
  
 +ADXL313 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
 +M:    Lucas Stankus <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml
 +F:    drivers/iio/accel/adxl313*
 +
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <[email protected]>
  S:    Supported
@@@ -595,16 -598,6 +595,16 @@@ W:       http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml
  F:    drivers/input/misc/adxl34x.c
  
 +ADXL355 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
 +M:    Puranjay Mohan <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml
 +F:    drivers/iio/accel/adxl355.h
 +F:    drivers/iio/accel/adxl355_core.c
 +F:    drivers/iio/accel/adxl355_i2c.c
 +F:    drivers/iio/accel/adxl355_spi.c
 +
  ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
  M:    Michael Hennerich <[email protected]>
  S:    Supported
@@@ -804,7 -797,7 +804,7 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-altera.c
  
  ALTERA MAILBOX DRIVER
 -M:    Joyce Ooi <joyce.ooi@intel.com>
 +M:    Mun Yew Tham <mun.yew.tham@intel.com>
  S:    Maintained
  F:    drivers/mailbox/mailbox-altera.c
  
@@@ -817,7 -810,7 +817,7 @@@ F: Documentation/devicetree/bindings/dm
  F:    drivers/dma/altera-msgdma.c
  
  ALTERA PIO DRIVER
 -M:    Joyce Ooi <joyce.ooi@intel.com>
 +M:    Mun Yew Tham <mun.yew.tham@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-altera.c
@@@ -909,7 -902,6 +909,7 @@@ F: include/uapi/linux/psp-sev.
  AMD DISPLAY CORE
  M:    Harry Wentland <[email protected]>
  M:    Leo Li <[email protected]>
 +M:    Rodrigo Siqueira <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
@@@ -985,12 -977,12 +985,12 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/platform/x86/amd-pmc.*
  
 -AMD POWERPLAY
 +AMD POWERPLAY AND SWSMU
  M:    Evan Quan <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
 -F:    drivers/gpu/drm/amd/pm/powerplay/
 +F:    drivers/gpu/drm/amd/pm/
  
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <[email protected]>
@@@ -1027,14 -1019,6 +1027,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
  F:    drivers/iio/light/as73211.c
  
 +AMT (Automatic Multicast Tunneling)
 +M:    Taehee Yoo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 +F:    drivers/net/amt.c
 +
  ANALOG DEVICES INC AD7192 DRIVER
  M:    Alexandru Tachici <[email protected]>
  L:    [email protected]
@@@ -1291,7 -1275,6 +1291,7 @@@ F:      drivers/input/mouse/bcm5974.
  
  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
@@@ -1428,7 -1411,7 +1428,7 @@@ F:      Documentation/devicetree/bindings/au
  F:    Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
 -F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
 +F:    Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
  F:    arch/arm/boot/dts/arm-realview-*
  F:    arch/arm/boot/dts/integrator*
  F:    arch/arm/boot/dts/versatile*
@@@ -1567,7 -1550,7 +1567,7 @@@ ARM PRIMECELL VIC PL190/PL192 DRIVE
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.yaml
  F:    drivers/irqchip/irq-vic.c
  
  ARM SMC WATCHDOG DRIVER
@@@ -1728,8 -1711,6 +1728,8 @@@ F:      drivers/*/*alpine
  
  ARM/APPLE MACHINE SUPPORT
  M:    Hector Martin <[email protected]>
 +M:    Sven Peter <[email protected]>
 +R:    Alyssa Rosenzweig <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    https://asahilinux.org
@@@ -1737,20 -1718,12 +1737,20 @@@ B:   https://github.com/AsahiLinux/linux/
  C:    irc://irc.oftc.net/asahi-dev
  T:    git https://github.com/AsahiLinux/linux.git
  F:    Documentation/devicetree/bindings/arm/apple.yaml
 +F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
 +F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
 +F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    arch/arm64/boot/dts/apple/
 +F:    drivers/i2c/busses/i2c-pasemi-core.c
 +F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/irqchip/irq-apple-aic.c
 +F:    drivers/mailbox/apple-mailbox.c
 +F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
 +F:    include/linux/apple-mailbox.h
  
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
@@@ -1772,7 -1745,7 +1772,7 @@@ R:      Joel Stanley <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
 +F:    Documentation/devicetree/bindings/i2c/aspeed,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.txt
  F:    drivers/i2c/busses/i2c-aspeed.c
  F:    drivers/irqchip/irq-aspeed-i2c-ic.c
@@@ -1899,10 -1872,10 +1899,10 @@@ M:   Linus Walleij <linus.walleij@linaro.
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/ulli-kroll/linux.git
 -F:    Documentation/devicetree/bindings/arm/gemini.txt
 +F:    Documentation/devicetree/bindings/arm/gemini.yaml
  F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 -F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
 +F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
  F:    arch/arm/boot/dts/gemini*
  F:    arch/arm/mach-gemini/
  F:    drivers/crypto/gemini/
@@@ -2263,7 -2236,6 +2263,7 @@@ F:      arch/arm/mach-pxa/mioa701.
  
  ARM/MStar/Sigmastar Armv7 SoC support
  M:    Daniel Palmer <[email protected]>
 +M:    Romain Perier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://linux-chenxing.org/
@@@ -2335,14 -2307,6 +2335,14 @@@ F:    arch/arm/boot/dts/nuvoton-wpcm450
  F:    arch/arm/mach-npcm/wpcm450.c
  F:    drivers/*/*wpcm*
  
 +ARM/NXP S32G ARCHITECTURE
 +M:    Chester Lin <[email protected]>
 +R:    Andreas Färber <[email protected]>
 +R:    Matthias Brugger <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/freescale/s32g*.dts*
 +
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  L:    [email protected] (subscribers-only)
  S:    Orphan
@@@ -2748,7 -2712,6 +2748,7 @@@ F:      drivers/power/reset/keystone-reset.
  
  ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
  M:    Nishanth Menon <[email protected]>
 +M:    Vignesh Raghavendra <[email protected]>
  M:    Tero Kristo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -2841,8 -2804,9 +2841,8 @@@ F:      arch/arm/mach-pxa/include/mach/vpac2
  F:    arch/arm/mach-pxa/vpac270.c
  
  ARM/VT8500 ARM ARCHITECTURE
 -M:    Tony Prisk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c
@@@ -2930,12 -2894,6 +2930,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
 +ASIX AX88796C SPI ETHERNET ADAPTER
 +M:    Łukasz Stelmach <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/asix,ax88796c.yaml
 +F:    drivers/net/ethernet/asix/ax88796c_*
 +
  ASPEED PINCTRL DRIVERS
  M:    Andrew Jeffery <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3004,7 -2962,7 +3004,7 @@@ F:      crypto/async_tx
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Bartosz Golaszewski <b[email protected]>
 +M:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -3155,7 -3113,6 +3155,7 @@@ W:      https://github.com/linux-audi
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
  F:    include/asm-generic/audit_*.h
  F:    include/linux/audit.h
 +F:    include/linux/audit_arch.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
  F:    lib/*audit.c
@@@ -3258,12 -3215,6 +3258,12 @@@ F:    drivers/video/backlight
  F:    include/linux/backlight.h
  F:    include/linux/pwm_backlight.h
  
 +BARCO P50 GPIO DRIVER
 +M:    Santosh Kumar Yadav <[email protected]>
 +M:    Peter Korsgaard <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/barco-p50-gpio.c
 +
  BATMAN ADVANCED
  M:    Marek Lindner <[email protected]>
  M:    Simon Wunderlich <[email protected]>
@@@ -3434,11 -3385,9 +3434,11 @@@ F:    Documentation/networking/filter.rs
  F:    Documentation/userspace-api/ebpf/
  F:    arch/*/net/*
  F:    include/linux/bpf*
 +F:    include/linux/btf*
  F:    include/linux/filter.h
  F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
 +F:    include/uapi/linux/btf*
  F:    include/uapi/linux/filter.h
  F:    kernel/bpf/
  F:    kernel/trace/bpf_trace.c
@@@ -3472,7 -3421,6 +3472,7 @@@ S:      Supporte
  F:    arch/arm64/net/
  
  BPF JIT for MIPS (32-BIT AND 64-BIT)
 +M:    Johan Almbladh <[email protected]>
  M:    Paul Burton <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -3661,8 -3609,6 +3661,8 @@@ F:      arch/arm/mm/cache-b15-rac.
  F:    drivers/bus/brcmstb_gisb.c
  F:    drivers/pci/controller/pcie-brcmstb.c
  N:    brcmstb
 +N:    bcm7038
 +N:    bcm7120
  
  BROADCOM BDC DRIVER
  M:    Al Cooper <[email protected]>
@@@ -3810,7 -3756,7 +3810,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
 -F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
 +F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
  F:    drivers/net/ethernet/broadcom/genet/
  F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
@@@ -3875,6 -3821,7 +3875,6 @@@ F:      drivers/scsi/mpi3mr
  
  BROADCOM NETXTREME-E ROCE DRIVER
  M:    Selvin Xavier <[email protected]>
 -M:    Naresh Kumar PBS <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.broadcom.com
@@@ -4483,7 -4430,7 +4483,7 @@@ N:      cros_e
  N:    cros-ec
  
  CHRONTEL CH7322 CEC DRIVER
 -M:    Jeff Chase <jnchase@google.com>
 +M:    Joe Tessler <jrt@google.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -4498,17 -4445,6 +4498,17 @@@ L:    [email protected]
  S:    Maintained
  F:    sound/soc/codecs/cs*
  
 +CIRRUS LOGIC DSP FIRMWARE DRIVER
 +M:    Simon Trimmer <[email protected]>
 +M:    Charles Keepax <[email protected]>
 +M:    Richard Fitzgerald <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://github.com/CirrusLogic/linux-drivers/wiki
 +T:    git https://github.com/CirrusLogic/linux-drivers.git
 +F:    drivers/firmware/cirrus/*
 +F:    include/linux/firmware/cirrus/*
 +
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <[email protected]>
  L:    [email protected]
@@@ -4720,7 -4656,7 +4720,7 @@@ W:      http://linux-cifs.samba.org
  T:    git git://git.samba.org/sfrench/cifs-2.6.git
  F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
 -F:    fs/cifs_common/
 +F:    fs/smbfs_common/
  
  COMPACTPCI HOTPLUG CORE
  M:    Scott Murray <[email protected]>
@@@ -4868,8 -4804,7 +4868,8 @@@ F:      Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
  F:    include/linux/counter.h
 -F:    include/linux/counter_enum.h
 +F:    include/uapi/linux/counter.h
 +F:    tools/counter/
  
  CP2615 I2C DRIVER
  M:    Bence Csókás <[email protected]>
@@@ -5517,19 -5452,6 +5517,19 @@@ F:    include/net/devlink.
  F:    include/uapi/linux/devlink.h
  F:    net/core/devlink.c
  
 +DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT
 +M:    Christoph Niedermaier <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/boot/dts/imx6*-dhcom-*
 +
 +DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
 +M:    Marek Vasut <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/boot/dts/stm32mp1*-dhcom-*
 +F:    arch/arm/boot/dts/stm32mp1*-dhcor-*
 +
  DIALOG SEMICONDUCTOR DRIVERS
  M:    Support Opensource <[email protected]>
  S:    Supported
@@@ -6096,12 -6018,6 +6096,12 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
  F:    drivers/gpu/drm/panel/panel-samsung-db7430.c
  
 +DRM DRIVER FOR SAMSUNG S6D27A1 PANELS
 +M:    Markuss Broks <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
 +F:    drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
 +
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
@@@ -6225,7 -6141,8 +6225,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/
  F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
 -F:    drivers/gpu/drm/
 -F:    drivers/gpu/vga/
 +F:    drivers/gpu/
  F:    include/drm/
  F:    include/linux/vga*
  F:    include/uapi/drm/
@@@ -6369,7 -6286,6 +6369,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/tegra/linux.git
  F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 +F:    Documentation/devicetree/bindings/gpu/host1x/
  F:    drivers/gpu/drm/tegra/
  F:    drivers/gpu/host1x/
  F:    include/linux/host1x.h
@@@ -6509,14 -6425,6 +6509,14 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/ttm/
  F:    include/drm/ttm/
  
 +DRM GPU SCHEDULER
 +M:    Andrey Grodzovsky <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/scheduler/
 +F:    include/drm/gpu_scheduler.h
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -6775,7 -6683,7 +6775,7 @@@ S:      Supporte
  F:    drivers/edac/dmc520_edac.c
  
  EDAC-E752X
 -M:    Mark Gross <mark[email protected]>
 +M:    Mark Gross <mark[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
@@@ -7098,6 -7006,7 +7098,6 @@@ F:      drivers/net/mdio/fwnode_mdio.
  F:    drivers/net/mdio/of_mdio.c
  F:    drivers/net/pcs/
  F:    drivers/net/phy/
 -F:    drivers/of/of_net.c
  F:    include/dt-bindings/net/qca-ar803x.h
  F:    include/linux/*mdio*.h
  F:    include/linux/mdio/*.h
@@@ -7109,7 -7018,6 +7109,7 @@@ F:      include/linux/platform_data/mdio-gpi
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
 +F:    net/core/of_net.c
  
  EXFAT FILE SYSTEM
  M:    Namjae Jeon <[email protected]>
@@@ -7415,15 -7323,6 +7415,15 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/nvidia/*
  
 +FORTIFY_SOURCE
 +M:    Kees Cook <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    include/linux/fortify-string.h
 +F:    lib/test_fortify/*
 +F:    scripts/test_fortify.sh
 +K:    \b__NO_FORTIFY\b
 +
  FPGA DFL DRIVERS
  M:    Wu Hao <[email protected]>
  R:    Tom Rix <[email protected]>
@@@ -7438,11 -7337,10 +7438,11 @@@ F:   include/uapi/linux/fpga-dfl.
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
 +M:    Wu Hao <[email protected]>
 +M:    Xu Yilun <[email protected]>
  R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.rocketboards.org
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
  F:    Documentation/devicetree/bindings/fpga/
@@@ -7536,7 -7434,7 +7536,7 @@@ FREESCALE IMX / MXC FEC DRIVE
  M:    Joakim Zhang <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/fsl-fec.txt
 +F:    Documentation/devicetree/bindings/net/fsl,fec.yaml
  F:    drivers/net/ethernet/freescale/fec.h
  F:    drivers/net/ethernet/freescale/fec_main.c
  F:    drivers/net/ethernet/freescale/fec_ptp.c
@@@ -7820,7 -7718,6 +7820,7 @@@ M:      Ingo Molnar <[email protected]
  R:    Peter Zijlstra <[email protected]>
  R:    Darren Hart <[email protected]>
  R:    Davidlohr Bueso <[email protected]>
 +R:    André Almeida <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -7828,7 -7725,7 +7828,7 @@@ F:      Documentation/locking/*futex
  F:    include/asm-generic/futex.h
  F:    include/linux/futex.h
  F:    include/uapi/linux/futex.h
 -F:    kernel/futex.c
 +F:    kernel/futex/*
  F:    tools/perf/bench/futex*
  F:    tools/testing/selftests/futex/
  
@@@ -8089,7 -7986,7 +8089,7 @@@ F:      include/linux/gpio/regmap.
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
 -M:    Bartosz Golaszewski <b[email protected]>
 +M:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
@@@ -8294,7 -8191,7 +8294,7 @@@ T:      git git://linuxtv.org/anttip/media_t
  F:    drivers/media/usb/hackrf/
  
  HANTRO VPU CODEC DRIVER
 -M:    Ezequiel Garcia <ezequiel@collabora.com>
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -8317,7 -8214,6 +8317,7 @@@ L:      [email protected]
  S:    Maintained
  W:    http://hwmon.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 +F:    Documentation/ABI/testing/sysfs-class-hwmon
  F:    Documentation/devicetree/bindings/hwmon/
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
@@@ -8712,8 -8608,9 +8712,8 @@@ F:      Documentation/devicetree/bindings/ii
  F:    drivers/iio/humidity/hts221*
  
  HUAWEI ETHERNET DRIVER
 -M:    Bin Luo <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
@@@ -8763,12 -8660,6 +8763,12 @@@ S:    Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/hi556.c
  
 +HYNIX HI846 SENSOR DRIVER
 +M:    Martin Kepplinger <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/hi846.c
 +
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
@@@ -9411,7 -9302,7 +9411,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/intel/atomisp2/led.c
  
  INTEL BIOS SAR INT1092 DRIVER
 -M:    Shravan S <[email protected]>
 +M:    Shravan Sudhakar <[email protected]>
  M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -9588,12 -9479,6 +9588,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/crypto/ixp4xx_crypto.c
  
 +INTEL ISHTP ECLITE DRIVER
 +M:    Sumesh K Naduvalath <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/platform/x86/intel/ishtp_eclite.c
 +
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <[email protected]>
  S:    Maintained
@@@ -9607,7 -9492,7 +9607,7 @@@ F:      include/linux/soc/ixp4xx/qmgr.
  INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
  M:    Deepak Saxena <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/intel,ixp46x-rng.yaml
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
  INTEL KEEM BAY DRM DRIVER
@@@ -9627,17 -9512,6 +9627,17 @@@ F:    drivers/crypto/keembay/keembay-ocs-a
  F:    drivers/crypto/keembay/ocs-aes.c
  F:    drivers/crypto/keembay/ocs-aes.h
  
 +INTEL KEEM BAY OCS ECC CRYPTO DRIVER
 +M:    Daniele Alessandrelli <[email protected]>
 +M:    Prabhjot Khurana <[email protected]>
 +M:    Mark Gross <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
 +F:    drivers/crypto/keembay/Kconfig
 +F:    drivers/crypto/keembay/Makefile
 +F:    drivers/crypto/keembay/keembay-ocs-ecc.c
 +F:    drivers/crypto/keembay/ocs-ecc-curve-defs.h
 +
  INTEL KEEM BAY OCS HCU CRYPTO DRIVER
  M:    Daniele Alessandrelli <[email protected]>
  M:    Declan Murphy <[email protected]>
@@@ -9750,7 -9624,7 +9750,7 @@@ F:      include/uapi/linux/isst_if.
  F:    tools/power/x86/intel-speed-select/
  
  INTEL STRATIX10 FIRMWARE DRIVERS
 -M:    Richard Gong <[email protected]>
 +M:    Dinh Nguyen <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
@@@ -10121,7 -9995,6 +10121,7 @@@ JC42.4 TEMPERATURE SENSOR DRIVE
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml
  F:    Documentation/hwmon/jc42.rst
  F:    drivers/hwmon/jc42.c
  
@@@ -10161,7 -10034,6 +10161,7 @@@ F:   include/linux/jbd2.
  JPU V4L2 MEM2MEM DRIVER FOR RENESAS
  M:    Mikhail Ulyanov <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    drivers/media/platform/rcar_jpu.c
  
@@@ -10322,8 -10194,8 +10322,8 @@@ M:   Hyunchul Lee <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
 -F:    fs/cifs_common/
  F:    fs/ksmbd/
 +F:    fs/smbfs_common/
  
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <[email protected]>
@@@ -10388,32 -10260,18 +10388,29 @@@ F:        arch/mips/include/uapi/asm/kvm
  F:    arch/mips/kvm/
  
  KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
- M:    Paul Mackerras <[email protected]>
- L:    [email protected]
- S:    Supported
- W:    http://www.linux-kvm.org/
- T:    git git://github.com/agraf/linux-2.6.git
+ L:    [email protected]
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm
  F:    arch/powerpc/include/asm/kvm*
  F:    arch/powerpc/include/uapi/asm/kvm*
  F:    arch/powerpc/kernel/kvm*
  F:    arch/powerpc/kvm/
  
 +KERNEL VIRTUAL MACHINE FOR RISC-V (KVM/riscv)
 +M:    Anup Patel <[email protected]>
 +R:    Atish Patra <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://github.com/kvm-riscv/linux.git
 +F:    arch/riscv/include/asm/kvm*
 +F:    arch/riscv/include/uapi/asm/kvm*
 +F:    arch/riscv/kvm/
 +
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
  M:    Janosch Frank <[email protected]>
  R:    David Hildenbrand <[email protected]>
 -R:    Cornelia Huck <[email protected]>
  R:    Claudio Imbrenda <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -10577,13 -10435,10 +10574,13 @@@ M:        Anil S Keshavamurthy <anil.s.keshava
  M:    "David S. Miller" <[email protected]>
  M:    Masami Hiramatsu <[email protected]>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
  F:    Documentation/trace/kprobes.rst
  F:    include/asm-generic/kprobes.h
  F:    include/linux/kprobes.h
  F:    kernel/kprobes.c
 +F:    lib/test_kprobes.c
 +F:    samples/kprobes
  
  KS0108 LCD CONTROLLER DRIVER
  M:    Miguel Ojeda <[email protected]>
@@@ -11031,7 -10886,7 +11028,7 @@@ LM90 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/hwmon/lm90.txt
 +F:    Documentation/devicetree/bindings/hwmon/national,lm90.yaml
  F:    Documentation/hwmon/lm90.rst
  F:    drivers/hwmon/lm90.c
  F:    include/dt-bindings/thermal/lm90.h
@@@ -11290,7 -11145,6 +11287,7 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  F:    Documentation/networking/devlink/mv88e6xxx.rst
  F:    drivers/net/dsa/mv88e6xxx/
 +F:    include/linux/dsa/mv88e6xxx.h
  F:    include/linux/platform_data/mv88e6xxx.h
  
  MARVELL ARMADA 3700 PHY DRIVERS
@@@ -11415,6 -11269,7 +11412,6 @@@ F:   Documentation/networking/device_driv
  F:    drivers/net/ethernet/marvell/octeontx2/af/
  
  MARVELL PRESTERA ETHERNET SWITCH DRIVER
 -M:    Vadym Kochan <[email protected]>
  M:    Taras Chornyi <[email protected]>
  S:    Supported
  W:    https://github.com/Marvell-switching/switchdev-prestera
@@@ -11508,29 -11363,8 +11505,29 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:    drivers/iio/proximity/mb1232.c
  
 +MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
 +R:    Iskren Chernev <[email protected]>
 +R:    Krzysztof Kozlowski <[email protected]>
 +R:    Marek Szyprowski <[email protected]>
 +R:    Matheus Castello <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
 +F:    drivers/power/supply/max17040_battery.c
 +
 +MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
 +R:    Hans de Goede <[email protected]>
 +R:    Krzysztof Kozlowski <[email protected]>
 +R:    Marek Szyprowski <[email protected]>
 +R:    Sebastian Krzyszkowiak <[email protected]>
 +R:    Purism Kernel Team <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
 +F:    drivers/power/supply/max17042_battery.c
 +
  MAXIM MAX77650 PMIC MFD DRIVER
 -M:    Bartosz Golaszewski <b[email protected]>
 +M:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/*max77650.yaml
@@@ -11836,7 -11670,6 +11833,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
 +F:    drivers/media/platform/rcar-isp.c
  F:    drivers/media/platform/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
@@@ -11982,9 -11815,7 +11979,9 @@@ F:   drivers/mmc/host/mtk-sd.
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <[email protected]>
  M:    Lorenzo Bianconi <[email protected]>
 -R:    Ryder Lee <[email protected]>
 +M:    Ryder Lee <[email protected]>
 +R:    Shayne Chen <[email protected]>
 +R:    Sean Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt76/
@@@ -12031,14 -11862,6 +12028,14 @@@ M: Sean Wang <[email protected]
  S:    Maintained
  F:    drivers/char/hw_random/mtk-rng.c
  
 +MEDIATEK SMI DRIVER
 +M:    Yong Wu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/memory-controllers/mediatek,smi*
 +F:    drivers/memory/mtk-smi.c
 +F:    include/soc/mediatek/smi.h
 +
  MEDIATEK SWITCH DRIVER
  M:    Sean Wang <[email protected]>
  M:    Landen Chao <[email protected]>
@@@ -12153,7 -11976,7 +12150,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 -M:    Mark Gross <m[email protected]>
 +M:    Mark Gross <m[email protected]>
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -12365,8 -12188,7 +12362,8 @@@ F:   arch/arm64/boot/dts/marvell/armada-3
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
 -M:    Hemant Kumar <[email protected]>
 +R:    Hemant Kumar <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
@@@ -12428,12 -12250,6 +12425,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/crypto/atmel-ecc.*
  
 +MICROCHIP EIC DRIVER
 +M:    Claudiu Beznea <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/irqchip/irq-mchp-eic.c
 +
  MICROCHIP I2C DRIVER
  M:    Codrin Ciubotariu <[email protected]>
  L:    [email protected]
@@@ -12612,7 -12428,7 +12609,7 @@@ F:   drivers/platform/surface/surface_gpe
  
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 -M:    Mark Gross <m[email protected]>
 +M:    Mark Gross <m[email protected]>
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -12929,7 -12745,6 +12926,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/i2c/mt9p031.h
  
@@@ -13224,7 -13039,6 +13221,7 @@@ F:   include/linux/dsa
  F:    include/linux/platform_data/dsa.h
  F:    include/net/dsa.h
  F:    net/dsa/
 +F:    tools/testing/selftests/drivers/net/dsa/
  
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
@@@ -13438,9 -13252,9 +13435,9 @@@ F:   Documentation/scsi/NinjaSCSI.rs
  F:    drivers/scsi/nsp32*
  
  NIOS2 ARCHITECTURE
 -M:    Ley Foon Tan <[email protected]>
 +M:    Dinh Nguyen <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  F:    arch/nios2/
  
  NITRO ENCLAVES (NE)
@@@ -13566,12 -13380,6 +13563,12 @@@ S: Maintaine
  F:    drivers/video/fbdev/nvidia/
  F:    drivers/video/fbdev/riva/
  
 +NVIDIA WMI EC BACKLIGHT DRIVER
 +M:    Daniel Dadap <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/platform/x86/nvidia-wmi-ec-backlight.c
 +
  NVM EXPRESS DRIVER
  M:    Keith Busch <[email protected]>
  M:    Jens Axboe <[email protected]>
@@@ -13626,7 -13434,7 +13623,7 @@@ M:   Ashish Kumar <[email protected]
  R:    Yogesh Gaur <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
 +F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
  F:    drivers/spi/spi-nxp-fspi.c
  
  NXP FXAS21002C DRIVER
@@@ -13654,13 -13462,6 +13651,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
 +NXP i.MX 8QXP ADC DRIVER
 +M:    Cai Huoqing <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
 +F:    drivers/iio/adc/imx8qxp-adc.c
 +
  NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -13716,7 -13517,6 +13713,7 @@@ NXP-NCI NFC DRIVE
  R:    Charles Gorand <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Supported
 +F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
@@@ -13724,7 -13524,7 +13721,7 @@@ M:   Mirela Rabulea <[email protected]
  R:    NXP Linux Team <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/media/imx8-jpeg.yaml
 +F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
  F:    drivers/media/platform/imx-jpeg
  
  NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
@@@ -13997,13 -13797,6 +13994,13 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov13858.c
  
 +OMNIVISION OV13B10 SENSOR DRIVER
 +M:    Arec Kao <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov13b10.c
 +
  OMNIVISION OV2680 SENSOR DRIVER
  M:    Rui Miguel Silva <[email protected]>
  L:    [email protected]
@@@ -15057,6 -14850,13 +15054,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-single.c
  
 -PIN CONTROLLER - ST SPEAR
 -M:    Viresh Kumar <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://www.st.com/spear
 -F:    drivers/pinctrl/spear/
 -
  PKTCDVD DRIVER
  M:    [email protected]
  S:    Orphan
@@@ -15105,6 -14905,7 +15102,6 @@@ S:   Maintaine
  W:    http://hwmon.wiki.kernel.org/
  W:    http://www.roeck-us.net/linux/drivers/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 -F:    Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
  F:    Documentation/devicetree/bindings/hwmon/ltc2978.txt
  F:    Documentation/devicetree/bindings/hwmon/max31785.txt
  F:    Documentation/hwmon/adm1275.rst
@@@ -15343,7 -15144,7 +15340,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
  F:    Documentation/admin-guide/ramoops.rst
  F:    Documentation/admin-guide/pstore-blk.rst
 -F:    Documentation/devicetree/bindings/reserved-memory/ramoops.txt
 +F:    Documentation/devicetree/bindings/reserved-memory/ramoops.yaml
  F:    drivers/acpi/apei/erst.c
  F:    drivers/firmware/efi/efi-pstore.c
  F:    fs/pstore/
@@@ -15653,7 -15454,6 +15650,7 @@@ M:   [email protected]
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
 +F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
  
  QUALCOMM CAMERA SUBSYSTEM DRIVER
@@@ -16075,12 -15875,6 +16072,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtw88/
  
 +REALTEK WIRELESS DRIVER (rtw89)
 +M:    Ping-Ke Shih <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wireless/realtek/rtw89/
 +
  REDPINE WIRELESS DRIVER
  M:    Amitkumar Karwar <[email protected]>
  M:    Siva Rebbagondla <[email protected]>
@@@ -16301,13 -16095,6 +16298,13 @@@ F: Documentation/ABI/*/sysfs-driver-hid
  F:    drivers/hid/hid-roccat*
  F:    include/linux/hid-roccat*
  
 +ROCKCHIP I2S TDM DRIVER
 +M:    Nicolas Frattaroli <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml
 +F:    sound/soc/rockchip/rockchip_i2s_tdm.*
 +
  ROCKCHIP ISP V1 DRIVER
  M:    Helen Koike <[email protected]>
  M:    Dafna Hirschfeld <[email protected]>
@@@ -16322,7 -16109,7 +16319,7 @@@ F:   include/uapi/linux/rkisp1-config.
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
  M:    Jacob Chen <[email protected]>
 -M:    Ezequiel Garcia <ezequiel@collabora.com>
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -16330,7 -16117,7 +16327,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/rockchip/rga/
  
  ROCKCHIP VIDEO DECODER DRIVER
 -M:    Ezequiel Garcia <ezequiel@collabora.com>
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -16506,7 -16293,6 +16503,7 @@@ S39
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
  M:    Christian Borntraeger <[email protected]>
 +R:    Alexander Gordeev <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -16585,6 -16371,7 +16582,6 @@@ F:   drivers/s390/crypto/vfio_ap_ops.
  F:    drivers/s390/crypto/vfio_ap_private.h
  
  S390 VFIO-CCW DRIVER
 -M:    Cornelia Huck <[email protected]>
  M:    Eric Farman <[email protected]>
  M:    Matthew Rosato <[email protected]>
  R:    Halil Pasic <[email protected]>
@@@ -16713,10 -16500,10 +16710,10 @@@ M:        Bartlomiej Zolnierkiewicz <b.zolnier
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
 +F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
  F:    Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
 -F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
 -F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
 +F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.yaml
 +F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.yaml
  F:    drivers/clk/clk-s2mps11.c
  F:    drivers/mfd/sec*.c
  F:    drivers/regulator/s2m*.c
@@@ -16861,6 -16648,13 +16858,6 @@@ M:  Lubomir Rintel <[email protected]
  S:    Supported
  F:    drivers/char/pcmcia/scr24x_cs.c
  
 -SCSI CDROM DRIVER
 -M:    Jens Axboe <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://www.kernel.dk
 -F:    drivers/scsi/sr*
 -
  SCSI RDMA PROTOCOL (SRP) INITIATOR
  M:    Bart Van Assche <[email protected]>
  L:    [email protected]
@@@ -17000,6 -16794,7 +16997,6 @@@ M:   Adrian Hunter <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci*
 -F:    include/linux/mmc/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
  M:    Eugen Hristev <[email protected]>
@@@ -17074,13 -16869,6 +17071,13 @@@ S: Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 +SENSEAIR SUNRISE 006-0-0007
 +M:    Jacopo Mondi <[email protected]>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-chemical-sunrise-co2
 +F:    Documentation/devicetree/bindings/iio/chemical/senseair,sunrise.yaml
 +F:    drivers/iio/chemical/sunrise_co2.c
 +
  SENSIRION SCD30 CARBON DIOXIDE SENSOR DRIVER
  M:    Tomasz Duszynski <[email protected]>
  S:    Maintained
@@@ -17090,12 -16878,6 +17087,12 @@@ F: drivers/iio/chemical/scd30_core.
  F:    drivers/iio/chemical/scd30_i2c.c
  F:    drivers/iio/chemical/scd30_serial.c
  
 +SENSIRION SCD4X CARBON DIOXIDE SENSOR DRIVER
 +M:    Roan van Dijk <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/chemical/sensirion,scd4x.yaml
 +F:    drivers/iio/chemical/scd4x.c
 +
  SENSIRION SGP40 GAS SENSOR DRIVER
  M:    Andreas Klinger <[email protected]>
  S:    Maintained
@@@ -17171,6 -16953,7 +17168,6 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <[email protected]>
 -M:    Guvenc Gulce <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -17847,17 -17630,21 +17844,17 @@@ W:        https://github.com/linux-speakup/spe
  B:    https://github.com/linux-speakup/speakup/issues
  F:    drivers/accessibility/speakup/
  
 -SPEAR CLOCK FRAMEWORK SUPPORT
 -M:    Viresh Kumar <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://www.st.com/spear
 -F:    drivers/clk/spear/
 -
 -SPEAR PLATFORM SUPPORT
 +SPEAR PLATFORM/CLOCK/PINCTRL SUPPORT
  M:    Viresh Kumar <[email protected]>
  M:    Shiraz Hashim <[email protected]>
 +M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.st.com/spear
  F:    arch/arm/boot/dts/spear*
  F:    arch/arm/mach-spear/
 +F:    drivers/clk/spear/
 +F:    drivers/pinctrl/spear/
  
  SPI NOR SUBSYSTEM
  M:    Tudor Ambarus <[email protected]>
@@@ -18011,6 -17798,7 +18008,6 @@@ F:   drivers/staging/nvec
  
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
  M:    Jens Frederich <[email protected]>
 -M:    Daniel Drake <[email protected]>
  M:    Jon Nettleton <[email protected]>
  S:    Maintained
  W:    http://wiki.laptop.org/go/DCON
@@@ -18101,8 -17889,7 +18098,8 @@@ M:   Olivier Moysan <olivier.moysan@foss.
  M:    Arnaud Pouliquen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
 +F:    Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
 +F:    Documentation/devicetree/bindings/sound/st,stm32-*.yaml
  F:    sound/soc/stm/
  
  STM32 TIMER/LPTIMER DRIVERS
@@@ -18179,11 -17966,10 +18176,11 @@@ F:        Documentation/admin-guide/svga.rs
  F:    arch/x86/boot/video*
  
  SWIOTLB SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 +M:    Christoph Hellwig <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
 +W:    http://git.infradead.org/users/hch/dma-mapping.git
 +T:    git git://git.infradead.org/users/hch/dma-mapping.git
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  F:    kernel/dma/swiotlb.c
@@@ -18199,7 -17985,7 +18196,7 @@@ F:   net/switchdev
  SY8106A REGULATOR DRIVER
  M:    Icenowy Zheng <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
 +F:    Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml
  F:    drivers/regulator/sy8106a-regulator.c
  
  SYNC FILE FRAMEWORK
@@@ -18671,7 -18457,7 +18668,7 @@@ S:   Supporte
  F:    drivers/net/ethernet/tehuti/*
  
  TELECOM CLOCK DRIVER FOR MCPL0010
 -M:    Mark Gross <mark[email protected]>
 +M:    Mark Gross <mark[email protected]>
  S:    Supported
  F:    drivers/char/tlclk.c
  
@@@ -18724,7 -18510,7 +18721,7 @@@ M:   Santosh Shilimkar <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
 -F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
 +F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
@@@ -18766,17 -18552,14 +18763,17 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-raremono.c
  
  THERMAL
 -M:    Zhang Rui <[email protected]>
 +M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
  R:    Amit Kucheria <[email protected]>
 +R:    Zhang Rui <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
 +F:    Documentation/ABI/testing/sysfs-class-thermal
  F:    Documentation/devicetree/bindings/thermal/
 +F:    Documentation/driver-api/thermal/
  F:    drivers/thermal/
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
@@@ -18904,7 -18687,7 +18901,7 @@@ F:   include/linux/clk/ti.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <[email protected]>
 -R:    Bartosz Golaszewski <b[email protected]>
 +R:    Bartosz Golaszewski <b[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
@@@ -18994,7 -18777,7 +18991,7 @@@ M:   Mark Greer <[email protected]
  L:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Supported
 -F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
 +F:    Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml
  F:    drivers/nfc/trf7970a.c
  
  TI TSC2046 ADC DRIVER
@@@ -19189,7 -18972,7 +19186,7 @@@ TRACIN
  M:    Steven Rostedt <[email protected]>
  M:    Ingo Molnar <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 +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
@@@ -19503,12 -19286,13 +19500,12 @@@ S:        Maintaine
  F:    drivers/usb/misc/chaoskey.c
  
  USB CYPRESS C67X00 DRIVER
 -M:    Peter Korsgaard <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/c67x00/
  
  USB DAVICOM DM9601 DRIVER
 -M:    Peter Korsgaard <[email protected]>
 +M:    Peter Korsgaard <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-usb.org/usbnet
@@@ -20155,13 -19939,6 +20152,13 @@@ S: Maintaine
  F:    drivers/i2c/busses/i2c-virtio.c
  F:    include/uapi/linux/virtio_i2c.h
  
 +VIRTIO PMEM DRIVER
 +M:    Pankaj Gupta <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/nvdimm/virtio_pmem.c
 +F:    drivers/nvdimm/nd_virtio.c
 +
  VIRTUAL BOX GUEST DEVICE DRIVER
  M:    Hans de Goede <[email protected]>
  M:    Arnd Bergmann <[email protected]>
@@@ -20557,7 -20334,6 +20554,7 @@@ X86 ARCHITECTURE (32-BIT AND 64-BIT
  M:    Thomas Gleixner <[email protected]>
  M:    Ingo Molnar <[email protected]>
  M:    Borislav Petkov <[email protected]>
 +M:    Dave Hansen <[email protected]>
  M:    [email protected]
  R:    "H. Peter Anvin" <[email protected]>
  L:    [email protected]
@@@ -20579,8 -20355,6 +20576,8 @@@ M:   Tony Luck <[email protected]
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-mce
 +F:    Documentation/x86/x86_64/machinecheck.rst
  F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
@@@ -20599,7 -20373,7 +20596,7 @@@ F:   arch/x86/mm
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
 -M:    Mark Gross <m[email protected]>
 +M:    Mark Gross <m[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
@@@ -20698,6 -20472,7 +20695,6 @@@ F:   samples/bpf/xdpsock
  F:    tools/lib/bpf/xsk*
  
  XEN BLOCK SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <[email protected]>
  M:    Roger Pau Monné <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -20745,7 -20520,7 +20742,7 @@@ S:   Supporte
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Juergen Gross <jgross@suse.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
@@@ -20768,8 -20543,7 +20765,8 @@@ S:   Supporte
  F:    sound/xen/*
  
  XEN SWIOTLB SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 +M:    Juergen Gross <[email protected]>
 +M:    Stefano Stabellini <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
@@@ -20928,6 -20702,7 +20925,6 @@@ S:   Maintaine
  F:    mm/zbud.c
  
  ZD1211RW WIRELESS DRIVER
 -M:    Daniel Drake <[email protected]>
  M:    Ulrich Kunitz <[email protected]>
  L:    [email protected]
  L:    [email protected] (subscribers-only)

diff --combined arch/powerpc/kvm/powerpc.c
index 8ab90ce8738fdad0ecd58722a8e1265da92e065e,3fd037d36afb299451adfba41188e3d43c66acbf..35e9cccdeef92fe87e04a4fe5f2197cb51674e5e
--- 1/arch/powerpc/kvm/powerpc.c
--- 2/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@@ -649,7 -649,7 +649,7 @@@ int kvm_vm_ioctl_check_extension(struc
                r = KVM_MAX_VCPUS;
                break;
        case KVM_CAP_MAX_VCPU_ID:
 -              r = KVM_MAX_VCPU_ID;
 +              r = KVM_MAX_VCPU_IDS;
                break;
  #ifdef CONFIG_PPC_BOOK3S_64
        case KVM_CAP_PPC_GET_SMMU_INFO:
@@@ -1094,7 -1094,7 +1094,7 @@@ static inline u64 sp_to_dp(u32 fprs
  
        preempt_disable();
        enable_kernel_fp();
-       asm ("lfs%U1%X1 0,%1; stfd%U0%X0 0,%0" : "=m"UPD_CONSTR (fprd) : "m"UPD_CONSTR (fprs)
+       asm ("lfs%U1%X1 0,%1; stfd%U0%X0 0,%0" : "=m<>" (fprd) : "m<>" (fprs)
             : "fr0");
        preempt_enable();
        return fprd;
@@@ -1106,7 -1106,7 +1106,7 @@@ static inline u32 dp_to_sp(u64 fprd
  
        preempt_disable();
        enable_kernel_fp();
-       asm ("lfd%U1%X1 0,%1; stfs%U0%X0 0,%0" : "=m"UPD_CONSTR (fprs) : "m"UPD_CONSTR (fprd)
+       asm ("lfd%U1%X1 0,%1; stfs%U0%X0 0,%0" : "=m<>" (fprs) : "m<>" (fprd)
             : "fr0");
        preempt_enable();
        return fprs;

diff --combined arch/powerpc/net/bpf_jit_comp.c
index fcbf7a917c566e5f73b24da3770e30d871f4182c,0df97af4dcaf790a7c6b20cb7decdbced77b1d6d..90ce75f0f1e2aeb531655cdbd9c75d03d688b10b
--- 1/arch/powerpc/net/bpf_jit_comp.c
--- 2/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@@ -210,11 -210,7 +210,11 @@@ skip_init_ctx
                /* Now build the prologue, body code & epilogue for real. */
                cgctx.idx = 0;
                bpf_jit_build_prologue(code_base, &cgctx);
 -              bpf_jit_build_body(fp, code_base, &cgctx, addrs, extra_pass);
 +              if (bpf_jit_build_body(fp, code_base, &cgctx, addrs, extra_pass)) {
 +                      bpf_jit_binary_free(bpf_hdr);
 +                      fp = org_fp;
 +                      goto out_addrs;
 +              }
                bpf_jit_build_epilogue(code_base, &cgctx);
  
                if (bpf_jit_enable > 1)
@@@ -241,8 -237,8 +241,8 @@@ skip_codegen_passes
        fp->jited_len = alloclen;
  
        bpf_flush_icache(bpf_hdr, (u8 *)bpf_hdr + (bpf_hdr->pages * PAGE_SIZE));
-       bpf_jit_binary_lock_ro(bpf_hdr);
        if (!fp->is_func || extra_pass) {
+               bpf_jit_binary_lock_ro(bpf_hdr);
                bpf_prog_fill_jited_linfo(fp, addrs);
  out_addrs:
                kfree(addrs);

diff --combined arch/powerpc/platforms/pseries/iommu.c
index a52af8fbf5711ccf3ccffb23a8b18d8a51a977b3,c140aa683f666f73b3d5a67a46aebdb227bc8f3c..49b401536d297428da3e54fcfd5deac7aa63731a
--- 1/arch/powerpc/platforms/pseries/iommu.c
--- 2/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@@ -929,8 -929,10 +929,10 @@@ static void find_existing_ddw_windows_n
                }
  
                window = ddw_list_new_entry(pdn, dma64);
-               if (!window)
+               if (!window) {
+                       of_node_put(pdn);
                        break;
+               }
  
                spin_lock(&dma_win_list_lock);
                list_add(&window->list, &dma_win_list);
@@@ -1159,14 -1161,15 +1161,15 @@@ static void reset_dma_window(struct pci
  /* Return largest page shift based on "IO Page Sizes" output of ibm,query-pe-dma-window. */
  static int iommu_get_page_shift(u32 query_page_size)
  {
-       /* Supported IO page-sizes according to LoPAR */
+       /* Supported IO page-sizes according to LoPAR, note that 2M is out of order */
        const int shift[] = {
                __builtin_ctzll(SZ_4K),   __builtin_ctzll(SZ_64K), __builtin_ctzll(SZ_16M),
                __builtin_ctzll(SZ_32M),  __builtin_ctzll(SZ_64M), __builtin_ctzll(SZ_128M),
-               __builtin_ctzll(SZ_256M), __builtin_ctzll(SZ_16G)
+               __builtin_ctzll(SZ_256M), __builtin_ctzll(SZ_16G), __builtin_ctzll(SZ_2M)
        };
  
        int i = ARRAY_SIZE(shift) - 1;
+       int ret = 0;
  
        /*
         * On LoPAR, ibm,query-pe-dma-window outputs "IO Page Sizes" using a bit field:
@@@ -1176,11 -1179,10 +1179,10 @@@
         */
        for (; i >= 0 ; i--) {
                if (query_page_size & (1 << i))
-                       return shift[i];
+                       ret = max(ret, shift[i]);
        }
  
-       /* No valid page size found. */
-       return 0;
+       return ret;
  }
  
  static struct property *ddw_property_create(const char *propname, u32 liobn, u64 dma_addr,
@@@ -1302,12 -1304,6 +1304,12 @@@ static bool enable_ddw(struct pci_dev *
                struct property *default_win;
                int reset_win_ext;
  
 +              /* DDW + IOMMU on single window may fail if there is any allocation */
 +              if (iommu_table_in_use(tbl)) {
 +                      dev_warn(&dev->dev, "current IOMMU table in use, can't be replaced.\n");
 +                      goto out_failed;
 +              }
 +
                default_win = of_find_property(pdn, "ibm,dma-window", NULL);
                if (!default_win)
                        goto out_failed;
@@@ -1362,6 -1358,12 +1364,6 @@@
                        query.largest_available_block,
                        1ULL << page_shift);
  
 -              /* DDW + IOMMU on single window may fail if there is any allocation */
 -              if (default_win_removed && iommu_table_in_use(tbl)) {
 -                      dev_dbg(&dev->dev, "current IOMMU table in use, can't be replaced.\n");
 -                      goto out_failed;
 -              }
 -
                len = order_base_2(query.largest_available_block << page_shift);
                win_name = DMA64_PROPNAME;
        } else {
@@@ -1411,19 -1413,18 +1413,19 @@@
        } else {
                struct iommu_table *newtbl;
                int i;
 +              unsigned long start = 0, end = 0;
  
                for (i = 0; i < ARRAY_SIZE(pci->phb->mem_resources); i++) {
                        const unsigned long mask = IORESOURCE_MEM_64 | IORESOURCE_MEM;
  
                        /* Look for MMIO32 */
 -                      if ((pci->phb->mem_resources[i].flags & mask) == IORESOURCE_MEM)
 +                      if ((pci->phb->mem_resources[i].flags & mask) == IORESOURCE_MEM) {
 +                              start = pci->phb->mem_resources[i].start;
 +                              end = pci->phb->mem_resources[i].end;
                                break;
 +                      }
                }
  
 -              if (i == ARRAY_SIZE(pci->phb->mem_resources))
 -                      goto out_del_list;
 -
                /* New table for using DDW instead of the default DMA window */
                newtbl = iommu_pseries_alloc_table(pci->phb->node);
                if (!newtbl) {
@@@ -1433,15 -1434,15 +1435,15 @@@
  
                iommu_table_setparms_common(newtbl, pci->phb->bus->number, create.liobn, win_addr,
                                            1UL << len, page_shift, NULL, &iommu_table_lpar_multi_ops);
 -              iommu_init_table(newtbl, pci->phb->node, pci->phb->mem_resources[i].start,
 -                               pci->phb->mem_resources[i].end);
 +              iommu_init_table(newtbl, pci->phb->node, start, end);
  
                pci->table_group->tables[1] = newtbl;
  
                /* Keep default DMA window stuct if removed */
                if (default_win_removed) {
                        tbl->it_size = 0;
 -                      kfree(tbl->it_map);
 +                      vfree(tbl->it_map);
 +                      tbl->it_map = NULL;
                }
  
                set_iommu_table_base(&dev->dev, newtbl);