Merge tag 's390-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Mar 2022 17:01:34 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Mar 2022 17:01:34 +0000 (10:01 -0700)
Pull s390 updates from Vasily Gorbik:

 - Raise minimum supported machine generation to z10, which comes with
   various cleanups and code simplifications (usercopy/spectre
   mitigation/etc).

 - Rework extables and get rid of anonymous out-of-line fixups.

 - Page table helpers cleanup. Add set_pXd()/set_pte() helper functions.
   Covert pte_val()/pXd_val() macros to functions.

 - Optimize kretprobe handling by avoiding extra kprobe on
   __kretprobe_trampoline.

 - Add support for CEX8 crypto cards.

 - Allow to trigger AP bus rescan via writing to /sys/bus/ap/scans.

 - Add CONFIG_EXPOLINE_EXTERN option to build the kernel without COMDAT
   group sections which simplifies kpatch support.

 - Always use the packed stack layout and extend kernel unwinder tests.

 - Add sanity checks for ftrace code patching.

 - Add s390dbf debug log for the vfio_ap device driver.

 - Various virtual vs physical address confusion fixes.

 - Various small fixes and improvements all over the code.

* tag 's390-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (69 commits)
  s390/test_unwind: add kretprobe tests
  s390/kprobes: Avoid additional kprobe in kretprobe handling
  s390: convert ".insn" encoding to instruction names
  s390: assume stckf is always present
  s390/nospec: move to single register thunks
  s390: raise minimum supported machine generation to z10
  s390/uaccess: Add copy_from/to_user_key functions
  s390/nospec: align and size extern thunks
  s390/nospec: add an option to use thunk-extern
  s390/nospec: generate single register thunks if possible
  s390/pci: make zpci_set_irq()/zpci_clear_irq() static
  s390: remove unused expoline to BC instructions
  s390/irq: use assignment instead of cast
  s390/traps: get rid of magic cast for per code
  s390/traps: get rid of magic cast for program interruption code
  s390/signal: fix typo in comments
  s390/asm-offsets: remove unused defines
  s390/test_unwind: avoid build warning with W=1
  s390: remove .fixup section
  s390/bpf: encode register within extable entry
  ...

1  2 
MAINTAINERS
arch/s390/Kconfig
arch/s390/include/asm/page.h
arch/s390/include/asm/sclp.h
arch/s390/include/asm/uaccess.h
arch/s390/kvm/kvm-s390.c

diff --combined MAINTAINERS
@@@ -389,11 -389,11 +389,11 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    drivers/acpi/arm64
  
 -ACPI I2C MULTI INSTANTIATE DRIVER
 +ACPI SERIAL MULTI INSTANTIATE DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/i2c-multi-instantiate.c
 +F:    drivers/platform/x86/serial-multi-instantiate.c
  
  ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
  M:    Sudeep Holla <sudeep.holla@arm.com>
@@@ -1002,7 -1002,6 +1002,7 @@@ L:      linux-pm@vger.kernel.or
  S:    Supported
  F:    Documentation/admin-guide/pm/amd-pstate.rst
  F:    drivers/cpufreq/amd-pstate*
 +F:    tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
  
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <sanju.mehta@amd.com>
@@@ -1032,15 -1031,6 +1032,15 @@@ S:    Maintaine
  F:    Documentation/hid/amd-sfh*
  F:    drivers/hid/amd-sfh-hid/
  
 +AMPHION VPU CODEC V4L2 DRIVER
 +M:    Ming Qian <ming.qian@nxp.com>
 +M:    Shijie Qin <shijie.qin@nxp.com>
 +M:    Zhou Peng <eagle.zhou@nxp.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/amphion,vpu.yaml
 +F:    drivers/media/platform/amphion/
 +
  AMS AS73211 DRIVER
  M:    Christian Eggers <ceggers@arri.de>
  L:    linux-iio@vger.kernel.org
@@@ -1239,6 -1229,18 +1239,6 @@@ S:     Supporte
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
  
 -ANDES ARCHITECTURE
 -M:    Nick Hu <nickhu@andestech.com>
 -M:    Greentime Hu <green.hu@gmail.com>
 -M:    Vincent Chen <deanbo422@gmail.com>
 -S:    Supported
 -T:    git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
 -F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
 -F:    Documentation/devicetree/bindings/nds32/
 -F:    arch/nds32/
 -N:    nds32
 -K:    nds32
 -
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <robh@kernel.org>
  S:    Supported
@@@ -1618,7 -1620,6 +1618,7 @@@ M:      Olof Johansson <olof@lixom.net
  M:    soc@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/boot/dts/Makefile
  F:    arch/arm64/boot/dts/Makefile
  ARM SUB-ARCHITECTURES
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/mach-*/
  F:    arch/arm/plat-*/
@@@ -1685,9 -1685,9 +1685,9 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <mripard@kernel.org>
  M:    Chen-Yu Tsai <wens@csie.org>
 -R:    Jernej Skrabec <jernej.skrabec@gmail.com>
 +M:    Jernej Skrabec <jernej.skrabec@gmail.com>
 +M:    Samuel Holland <samuel@sholland.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1767,7 -1767,7 +1767,7 @@@ T:      git https://github.com/AsahiLinux/li
  F:    Documentation/devicetree/bindings/arm/apple.yaml
  F:    Documentation/devicetree/bindings/arm/apple/*
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
 -F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
@@@ -1780,7 -1780,6 +1780,7 @@@ F:      drivers/irqchip/irq-apple-aic.
  F:    drivers/mailbox/apple-mailbox.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
@@@ -2117,6 -2116,13 +2117,6 @@@ F:     Documentation/devicetree/bindings/ar
  F:    arch/arm64/boot/dts/intel/keembay-evm.dts
  F:    arch/arm64/boot/dts/intel/keembay-soc.dtsi
  
 -ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
 -M:    Jonathan Cameron <jic23@cam.ac.uk>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/stargate2.c
 -F:    drivers/pcmcia/pxa2xx_stargate2.c
 -
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2245,7 -2251,7 +2245,7 @@@ F:      drivers/phy/mediatek
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
 -M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  W:    http://www.linux4sam.org
@@@ -2358,7 -2364,6 +2358,7 @@@ L:      openbmc@lists.ozlabs.org (moderated 
  S:    Supported
  F:    Documentation/devicetree/bindings/*/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*npcm*
 +F:    Documentation/devicetree/bindings/arm/npcm/*
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    arch/arm/mach-npcm/
  F:    drivers/*/*npcm*
@@@ -2369,7 -2374,6 +2369,7 @@@ ARM/NUVOTON WPCM450 ARCHITECTUR
  M:    Jonathan Neuschäfer <j.neuschaefer@gmx.net>
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  S:    Maintained
 +W:    https://github.com/neuschaefer/wpcm450/wiki
  F:    Documentation/devicetree/bindings/*/*wpcm*
  F:    arch/arm/boot/dts/nuvoton-wpcm450*
  F:    arch/arm/mach-npcm/wpcm450.c
@@@ -2524,7 -2528,6 +2524,7 @@@ M:      Magnus Damm <magnus.damm@gmail.com
  L:    linux-renesas-soc@vger.kernel.org
  S:    Supported
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 +C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    arch/arm64/boot/dts/renesas/
@@@ -2566,14 -2569,11 +2566,14 @@@ F:   sound/soc/rockchip
  N:    rockchip
  
  ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
 +R:    Alim Akhtar <alim.akhtar@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
@@@ -2608,7 -2608,7 +2608,7 @@@ M:      Łukasz Stelmach <l.stelmach@samsung
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/platform/s5p-g2d/
 +F:    drivers/media/platform/samsung/s5p-g2d/
  
  ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -2625,7 -2625,7 +2625,7 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/platform/s5p-jpeg/
 +F:    drivers/media/platform/samsung/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -2633,7 -2633,7 +2633,7 @@@ M:      Andrzej Hajda <andrzej.hajda@intel.c
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/platform/s5p-mfc/
 +F:    drivers/media/platform/samsung/s5p-mfc/
  
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
@@@ -2641,7 -2641,6 +2641,7 @@@ M:      Magnus Damm <magnus.damm@gmail.com
  L:    linux-renesas-soc@vger.kernel.org
  S:    Supported
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 +C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    arch/arm/boot/dts/emev2*
@@@ -2703,7 -2702,7 +2703,7 @@@ F:      drivers/clocksource/clksrc_st_lpc.
  F:    drivers/cpufreq/sti-cpufreq.c
  F:    drivers/dma/st_fdma*
  F:    drivers/i2c/busses/i2c-st.c
 -F:    drivers/media/platform/sti/c8sectpfe/
 +F:    drivers/media/platform/st/sti/c8sectpfe/
  F:    drivers/media/rc/st_rc.c
  F:    drivers/mmc/host/sdhci-st.c
  F:    drivers/phy/st/phy-miphy28lp.c
@@@ -2734,7 -2733,7 +2734,7 @@@ N:      stm3
  N:    stm
  
  ARM/Synaptics SoC support
 -M:    Jisheng Zhang <Jisheng.Zhang@synaptics.com>
 +M:    Jisheng Zhang <jszhang@kernel.org>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -2755,14 -2754,6 +2755,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/media/tegra-cec.txt
  F:    drivers/media/cec/platform/tegra/
  
 +ARM/TESLA FSD SoC SUPPORT
 +M:    Alim Akhtar <alim.akhtar@samsung.com>
 +M:    linux-fsd@tesla.com
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-samsung-soc@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm64/boot/dts/tesla*
 +
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <mark.brown314@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -3027,7 -3018,7 +3027,7 @@@ L:      linux-media@vger.kernel.or
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/aspeed-video.txt
 -F:    drivers/media/platform/aspeed-video.c
 +F:    drivers/media/platform/aspeed/
  
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <corentin.chary@gmail.com>
@@@ -3059,12 -3050,6 +3059,12 @@@ L:    linux-hwmon@vger.kernel.or
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_ec_sensors.c
  
 +ASUS EC HARDWARE MONITOR DRIVER
 +M:    Eugene Shalygin <eugene.shalygin@gmail.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hwmon/asus-ec-sensors.c
 +
  ASUS WIRELESS RADIO CONTROL DRIVER
  M:    João Paulo Rechi Vita <jprvita@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -3148,9 -3133,11 +3148,9 @@@ W:     https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@kernel.org>
  L:    linux-wireless@vger.kernel.org
 -S:    Supported
 +S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath6kl/
  
  ATI_REMOTE2 DRIVER
@@@ -3207,7 -3194,6 +3207,7 @@@ ATOMIC INFRASTRUCTUR
  M:    Will Deacon <will@kernel.org>
  M:    Peter Zijlstra <peterz@infradead.org>
  R:    Boqun Feng <boqun.feng@gmail.com>
 +R:    Mark Rutland <mark.rutland@arm.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
@@@ -3389,7 -3375,7 +3389,7 @@@ L:      linux-media@vger.kernel.or
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/bdisp
 +F:    drivers/media/platform/st/sti/bdisp
  
  BECKHOFF CX5020 ETHERCAT MASTER DRIVER
  M:    Dariusz Marcinkiewicz <reksio@newterm.pl>
@@@ -3450,7 -3436,6 +3450,7 @@@ F:      Documentation/ABI/stable/sysfs-bloc
  F:    Documentation/block/
  F:    block/
  F:    drivers/block/
 +F:    include/linux/bio.h
  F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
@@@ -3538,8 -3523,6 +3538,8 @@@ F:      net/sched/act_bpf.
  F:    net/sched/cls_bpf.c
  F:    samples/bpf/
  F:    scripts/bpf_doc.py
 +F:    scripts/pahole-flags.sh
 +F:    scripts/pahole-version.sh
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
@@@ -3832,6 -3815,9 +3832,6 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <aspriel@gmail.com>
  M:    Franky Lin <franky.lin@broadcom.com>
  M:    Hante Meuleman <hante.meuleman@broadcom.com>
 -M:    Chi-hsien Lin <chi-hsien.lin@infineon.com>
 -M:    Wright Feng <wright.feng@infineon.com>
 -M:    Chung-hsien Hsu <chung-hsien.hsu@infineon.com>
  L:    linux-wireless@vger.kernel.org
  L:    brcm80211-dev-list.pdl@broadcom.com
  L:    SHA-cyfmac-dev-list@infineon.com
@@@ -3915,7 -3901,7 +3915,7 @@@ M:      Scott Branden <sbranden@broadcom.com
  M:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://github.com/broadcom/cygnus-linux.git
 +T:    git git://github.com/broadcom/stblinux.git
  F:    arch/arm64/boot/dts/broadcom/northstar2/*
  F:    arch/arm64/boot/dts/broadcom/stingray/*
  F:    drivers/clk/bcm/clk-ns*
@@@ -4253,7 -4239,7 +4253,7 @@@ L:      linux-media@vger.kernel.or
  S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/cafe_ccic*
 -F:    drivers/media/platform/marvell-ccic/
 +F:    drivers/media/platform/marvell/
  
  CAIF NETWORK LAYER
  L:    netdev@vger.kernel.org
@@@ -4456,7 -4442,6 +4456,7 @@@ F:      drivers/power/supply/cw2015_battery.
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <idryomov@gmail.com>
  M:    Jeff Layton <jlayton@kernel.org>
 +M:    Xiubo Li <xiubli@redhat.com>
  L:    ceph-devel@vger.kernel.org
  S:    Supported
  W:    http://ceph.com/
@@@ -4467,7 -4452,6 +4467,7 @@@ F:      net/ceph
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
  M:    Jeff Layton <jlayton@kernel.org>
 +M:    Xiubo Li <xiubli@redhat.com>
  M:    Ilya Dryomov <idryomov@gmail.com>
  L:    ceph-devel@vger.kernel.org
  S:    Supported
@@@ -4559,7 -4543,6 +4559,7 @@@ F:      drivers/platform/chrome
  
  CHROMEOS EC CODEC DRIVER
  M:    Cheng-Yi Chiang <cychiang@chromium.org>
 +M:    Tzung-Bi Shih <tzungbi@google.com>
  R:    Guenter Roeck <groeck@chromium.org>
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
@@@ -4779,7 -4762,7 +4779,7 @@@ M:      Philipp Zabel <p.zabel@pengutronix.d
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/coda.yaml
 -F:    drivers/media/platform/coda/
 +F:    drivers/media/platform/chips-media/
  
  CODE OF CONDUCT
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@@ -4925,8 -4908,7 +4925,8 @@@ F:      kernel/cgroup/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <hannes@cmpxchg.org>
  M:    Michal Hocko <mhocko@kernel.org>
 -M:    Vladimir Davydov <vdavydov.dev@gmail.com>
 +M:    Roman Gushchin <roman.gushchin@linux.dev>
 +M:    Shakeel Butt <shakeelb@google.com>
  L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
  S:    Maintained
@@@ -5329,7 -5311,6 +5329,7 @@@ DATA ACCESS MONITO
  M:    SeongJae Park <sj@kernel.org>
  L:    linux-mm@kvack.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
  F:    Documentation/admin-guide/mm/damon/
  F:    Documentation/vm/damon/
  F:    include/linux/damon.h
@@@ -5423,7 -5404,6 +5423,7 @@@ F:      drivers/platform/x86/dell/dell-rbtn.
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 +F:    Documentation/ABI/obsolete/procfs-i8k
  F:    drivers/hwmon/dell-smm-hwmon.c
  F:    include/uapi/linux/i8k.h
  
@@@ -5493,7 -5473,7 +5493,7 @@@ L:      linux-media@vger.kernel.or
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/delta
 +F:    drivers/media/platform/st/sti/delta
  
  DELTA AHE-50DC FAN CONTROL MODULE DRIVER
  M:    Zev Weiss <zev@bewilderbeest.net>
@@@ -5605,7 -5585,7 +5605,7 @@@ F:      include/linux/devm-helpers.
  
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <agk@redhat.com>
 -M:    Mike Snitzer <snitzer@redhat.com>
 +M:    Mike Snitzer <snitzer@kernel.org>
  M:    dm-devel@redhat.com
  L:    dm-devel@redhat.com
  S:    Maintained
@@@ -5753,7 -5733,7 +5753,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/driver-api/dma-buf.rst
  F:    drivers/dma-buf/
  F:    include/linux/*fence.h
 -F:    include/linux/dma-buf*
 +F:    include/linux/dma-buf.h
  F:    include/linux/dma-resv.h
  K:    \bdma_(?:buf|fence|resv)\b
  
@@@ -5792,7 -5772,7 +5792,7 @@@ F:      tools/testing/selftests/dma
  
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <sumit.semwal@linaro.org>
 -R:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +R:    Benjamin Gaignard <benjamin.gaignard@collabora.com>
  R:    Liam Mark <lmark@codeaurora.org>
  R:    Laura Abbott <labbott@redhat.com>
  R:    Brian Starkey <Brian.Starkey@arm.com>
@@@ -6096,8 -6076,7 +6096,8 @@@ L:      dri-devel@lists.freedesktop.or
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/panel/panel-lvds.c
 -F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
 +F:    Documentation/devicetree/bindings/display/lvds.yaml
 +F:    Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
  
  DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
  M:    Guido Günther <agx@sigxcpu.org>
@@@ -6126,14 -6105,6 +6126,14 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
  F:    drivers/gpu/drm/tiny/mi0283qt.c
  
 +DRM DRIVER FOR MIPI DBI compatible panels
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +S:    Maintained
 +W:    https://github.com/notro/panel-mipi-dbi/wiki
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
 +F:    drivers/gpu/drm/tiny/panel-mipi-dbi.c
 +
  DRM DRIVER FOR MSM ADRENO GPU
  M:    Rob Clark <robdclark@gmail.com>
  M:    Sean Paul <sean@poorly.run>
@@@ -6154,13 -6125,6 +6154,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
  F:    drivers/gpu/drm/panel/panel-novatek-nt35510.c
  
 +DRM DRIVER FOR NOVATEK NT35560 PANELS
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
 +F:    drivers/gpu/drm/panel/panel-novatek-nt35560.c
 +
  DRM DRIVER FOR NOVATEK NT36672A PANELS
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  S:    Maintained
@@@ -6197,13 -6161,6 +6197,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/repaper.txt
  F:    drivers/gpu/drm/tiny/repaper.c
  
 +DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
 +M:    Javier Martinez Canillas <javierm@redhat.com>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
 +F:    drivers/gpu/drm/solomon/ssd130x*
 +
  DRM DRIVER FOR QEMU'S CIRRUS DEVICE
  M:    Dave Airlie <airlied@redhat.com>
  M:    Gerd Hoffmann <kraxel@redhat.com>
@@@ -6292,6 -6249,12 +6292,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
  F:    drivers/gpu/drm/tiny/st7735r.c
  
 -DRM DRIVER FOR SONY ACX424AKP PANELS
 -M:    Linus Walleij <linus.walleij@linaro.org>
 -S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    drivers/gpu/drm/panel/panel-sony-acx424akp.c
 -
  DRM DRIVER FOR ST-ERICSSON MCDE
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
@@@ -6338,8 -6301,8 +6338,8 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/vboxvideo/
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
 -M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
  M:    Zack Rusin <zackr@vmware.com>
 +R:    VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6539,7 -6502,7 +6539,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
 -M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +M:    Alain Volmat <alain.volmat@foss.st.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6548,8 -6511,8 +6548,8 @@@ F:      drivers/gpu/drm/st
  
  DRM DRIVERS FOR STM
  M:    Yannick Fertre <yannick.fertre@foss.st.com>
 +M:    Raphael Gallais-Pou <raphael.gallais-pou@foss.st.com>
  M:    Philippe Cornu <philippe.cornu@foss.st.com>
 -M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7043,6 -7006,12 +7043,6 @@@ L:     linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 -EDAC-SIFIVE
 -M:    Yash Shah <yash.shah@sifive.com>
 -L:    linux-edac@vger.kernel.org
 -S:    Supported
 -F:    drivers/edac/sifive_edac.c
 -
  EDAC-SKYLAKE
  M:    Tony Luck <tony.luck@intel.com>
  L:    linux-edac@vger.kernel.org
@@@ -7213,7 -7182,7 +7213,7 @@@ F:      drivers/net/can/usb/etas_es58x
  
  ETHERNET BRIDGE
  M:    Roopa Prabhu <roopa@nvidia.com>
 -M:    Nikolay Aleksandrov <nikolay@nvidia.com>
 +M:    Nikolay Aleksandrov <razor@blackwall.org>
  L:    bridge@lists.linux-foundation.org (moderated for non-subscribers)
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -7256,9 -7225,6 +7256,9 @@@ F:      net/core/of_net.
  EXEC & BINFMT API
  R:    Eric Biederman <ebiederm@xmission.com>
  R:    Kees Cook <keescook@chromium.org>
 +L:    linux-mm@kvack.org
 +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
@@@ -7266,7 -7232,6 +7266,7 @@@ F:      fs/exec.
  F:    include/linux/binfmts.h
  F:    include/linux/elf.h
  F:    include/uapi/linux/binfmts.h
 +F:    include/uapi/linux/elf.h
  F:    tools/testing/selftests/exec/
  N:    asm/elf.h
  N:    binfmt
@@@ -7302,9 -7267,7 +7302,9 @@@ Extended Verification Module (EVM
  M:    Mimi Zohar <zohar@linux.ibm.com>
  L:    linux-integrity@vger.kernel.org
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/evm/
 +F:    security/integrity/
  
  EXTENSIBLE FIRMWARE INTERFACE (EFI)
  M:    Ard Biesheuvel <ardb@kernel.org>
@@@ -7612,12 -7575,6 +7612,12 @@@ S:    Maintaine
  W:    http://floatingpoint.sourceforge.net/emulator/index.html
  F:    arch/x86/math-emu/
  
 +FRAMEBUFFER CORE
 +M:    Daniel Vetter <daniel@ffwll.ch>
 +F:    drivers/video/fbdev/core/
 +S:    Odd Fixes
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  FRAMEBUFFER LAYER
  M:    Helge Deller <deller@gmx.de>
  L:    linux-fbdev@vger.kernel.org
@@@ -7781,7 -7738,8 +7781,7 @@@ M:      Qiang Zhao <qiang.zhao@nxp.com
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/soc/fsl/qe/
 -F:    include/soc/fsl/*qe*.h
 -F:    include/soc/fsl/*ucc*.h
 +F:    include/soc/fsl/qe/
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <leoyang.li@nxp.com>
@@@ -7812,7 -7770,6 +7812,7 @@@ F:      Documentation/devicetree/bindings/mi
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
 +F:    include/soc/fsl/
  
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <pantelis.antoniou@gmail.com>
@@@ -7823,10 -7780,10 +7823,10 @@@ F:   drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Nicolin Chen <nicoleotsuka@gmail.com>
 +M:    Shengjiu Wang <shengjiu.wang@gmail.com>
  M:    Xiubo Li <Xiubo.Lee@gmail.com>
  R:    Fabio Estevam <festevam@gmail.com>
 -R:    Shengjiu Wang <shengjiu.wang@gmail.com>
 +R:    Nicolin Chen <nicoleotsuka@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
@@@ -7967,12 -7924,6 +7967,12 @@@ L:    platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-tablet.c
  
 +FUNGIBLE ETHERNET DRIVERS
 +M:    Dimitris Michailidis <dmichail@fungible.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/fungible/
 +
  FUSE: FILESYSTEM IN USERSPACE
  M:    Miklos Szeredi <miklos@szeredi.hu>
  L:    linux-fsdevel@vger.kernel.org
@@@ -8686,7 -8637,7 +8686,7 @@@ S:      Maintaine
  F:    drivers/gpio/gpio-hisi.c
  
  HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Longfang Liu <liulongfang@huawei.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-hpre
@@@ -8746,9 -8697,9 +8746,9 @@@ L:      linux-crypto@vger.kernel.or
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-zip
  F:    drivers/crypto/hisilicon/qm.c
 -F:    drivers/crypto/hisilicon/qm.h
  F:    drivers/crypto/hisilicon/sgl.c
  F:    drivers/crypto/hisilicon/zip/
 +F:    include/linux/hisi_acc_qm.h
  
  HISILICON ROCE DRIVER
  M:    Wenpeng Liang <liangwenpeng@huawei.com>
@@@ -8766,8 -8717,8 +8766,8 @@@ F:      Documentation/devicetree/bindings/sc
  F:    drivers/scsi/hisi_sas/
  
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 -M:    Zaibo Xu <xuzaibo@huawei.com>
  M:    Kai Ye <yekai13@huawei.com>
 +M:    Longfang Liu <liulongfang@huawei.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-sec
@@@ -8798,7 -8749,7 +8798,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    drivers/mfd/hi6421-spmi-pmic.c
  
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Weili Qian <qianweili@huawei.com>
  S:    Maintained
  F:    drivers/crypto/hisilicon/trng/trng.c
  
@@@ -8912,7 -8863,7 +8912,7 @@@ L:      linux-media@vger.kernel.or
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/hva
 +F:    drivers/media/platform/st/sti/hva
  
  HWPOISON MEMORY FAILURE HANDLING
  M:    Naoya Horiguchi <naoya.horiguchi@nec.com>
@@@ -8947,12 -8898,6 +8947,12 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/i2c/hi846.c
  
 +HYNIX HI847 SENSOR DRIVER
 +M:    Shawn Tu <shawnx.tu@intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/hi847.c
 +
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
@@@ -9307,15 -9252,6 +9307,15 @@@ S:    Maintaine
  W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
 +IDMAPPED MOUNTS
 +M:    Christian Brauner <brauner@kernel.org>
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 +F:    Documentation/filesystems/idmappings.rst
 +F:    tools/testing/selftests/mount_setattr/
 +F:    include/linux/mnt_idmapping.h
 +
  IDT VersaClock 5 CLOCK DRIVER
  M:    Luca Ceresoli <luca@lucaceresoli.net>
  S:    Maintained
@@@ -9573,7 -9509,6 +9573,7 @@@ L:      linux-integrity@vger.kernel.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/ima/
 +F:    security/integrity/
  
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
@@@ -10067,14 -10002,6 +10067,14 @@@ L: linux-iio@vger.kernel.or
  F:    Documentation/devicetree/bindings/counter/interrupt-counter.yaml
  F:    drivers/counter/interrupt-cnt.c
  
 +INTERSIL ISL7998X VIDEO DECODER DRIVER
 +M:    Michael Tretter <m.tretter@pengutronix.de>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/isil,isl79987.yaml
 +F:    drivers/media/i2c/isl7998x.c
 +
  INVENSENSE ICM-426xx IMU DRIVER
  M:    Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
  L:    linux-iio@vger.kernel.org
@@@ -10122,13 -10049,6 +10122,13 @@@ F: include/linux/iova.
  F:    include/linux/of_iommu.h
  F:    include/uapi/linux/iommu.h
  
 +IOSYS-MAP HELPERS
 +M:    Thomas Zimmermann <tzimmermann@suse.de>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    include/linux/iosys-map.h
 +
  IO_URING
  M:    Jens Axboe <axboe@kernel.dk>
  R:    Pavel Begunkov <asml.silence@gmail.com>
@@@ -10381,7 -10301,7 +10381,7 @@@ M:   Mikhail Ulyanov <mikhail.ulyanov@cog
  L:    linux-media@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/platform/rcar_jpu.c
 +F:    drivers/media/platform/renesas/rcar_jpu.c
  
  JSM Neo PCI based serial card
  L:    linux-serial@vger.kernel.org
@@@ -10520,8 -10440,6 +10520,8 @@@ KERNEL REGRESSION
  M:    Thorsten Leemhuis <linux@leemhuis.info>
  L:    regressions@lists.linux.dev
  S:    Supported
 +F:    Documentation/admin-guide/reporting-regressions.rst
 +F:    Documentation/process/handling-regressions.rst
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <shuah@kernel.org>
@@@ -10629,8 -10547,8 +10629,8 @@@ F:   arch/riscv/kvm
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@linux.ibm.com>
  M:    Janosch Frank <frankja@linux.ibm.com>
 +M:    Claudio Imbrenda <imbrenda@linux.ibm.com>
  R:    David Hildenbrand <david@redhat.com>
 -R:    Claudio Imbrenda <imbrenda@linux.ibm.com>
  L:    kvm@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -10727,14 -10645,6 +10727,14 @@@ F: include/linux/keyctl.
  F:    include/uapi/linux/keyctl.h
  F:    security/keys/
  
 +KEYS/KEYRINGS_INTEGRITY
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
 +M:    Mimi Zohar <zohar@linux.ibm.com>
 +L:    linux-integrity@vger.kernel.org
 +L:    keyrings@vger.kernel.org
 +S:    Supported
 +F:    security/integrity/platform_certs
 +
  KFENCE
  M:    Alexander Potapenko <glider@google.com>
  M:    Marco Elver <elver@google.com>
@@@ -10840,6 -10750,7 +10840,6 @@@ L7 BPF FRAMEWOR
  M:    John Fastabend <john.fastabend@gmail.com>
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Jakub Sitnicki <jakub@cloudflare.com>
 -M:    Lorenz Bauer <lmb@cloudflare.com>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
@@@ -11204,17 -11115,12 +11204,17 @@@ F:        lib/list-test.
  LITEX PLATFORM
  M:    Karol Gugala <kgugala@antmicro.com>
  M:    Mateusz Holenko <mholenko@antmicro.com>
 +M:    Gabriel Somlo <gsomlo@gmail.com>
 +M:    Joel Stanley <joel@jms.id.au>
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/litex,*.yaml
  F:    arch/openrisc/boot/dts/or1klitex.dts
 -F:    drivers/soc/litex/litex_soc_ctrl.c
 -F:    drivers/tty/serial/liteuart.c
  F:    include/linux/litex.h
 +F:    drivers/tty/serial/liteuart.c
 +F:    drivers/soc/litex/*
 +F:    drivers/net/ethernet/litex/*
 +F:    drivers/mmc/host/litex_mmc.c
 +N:    litex
  
  LIVE PATCHING
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
@@@ -11407,13 -11313,6 +11407,13 @@@ S: Maintaine
  W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
  
 +LYNX 28G SERDES PHY DRIVER
 +M:    Ioana Ciornei <ioana.ciornei@nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml
 +F:    drivers/phy/freescale/phy-fsl-lynx-28g.c
 +
  LYNX PCS MODULE
  M:    Ioana Ciornei <ioana.ciornei@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -11761,7 -11660,7 +11761,7 @@@ F:   drivers/iio/proximity/mb1232.
  
  MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
  R:    Iskren Chernev <iskren.chernev@gmail.com>
 -R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +R:    Krzysztof Kozlowski <krzk@kernel.org>
  R:    Marek Szyprowski <m.szyprowski@samsung.com>
  R:    Matheus Castello <matheus@castello.eng.br>
  L:    linux-pm@vger.kernel.org
@@@ -11771,7 -11670,7 +11771,7 @@@ F:   drivers/power/supply/max17040_batter
  
  MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
  R:    Hans de Goede <hdegoede@redhat.com>
 -R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +R:    Krzysztof Kozlowski <krzk@kernel.org>
  R:    Marek Szyprowski <m.szyprowski@samsung.com>
  R:    Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
  R:    Purism Kernel Team <kernel@puri.sm>
@@@ -11805,7 -11704,7 +11805,7 @@@ MAXIM MAX77802 PMIC REGULATOR DEVICE DR
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/*/*max77802.txt
 +F:    Documentation/devicetree/bindings/*/*max77802.yaml
  F:    drivers/regulator/max77802-regulator.c
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -11816,26 -11715,23 +11816,26 @@@ F:        Documentation/devicetree/bindings/po
  F:    drivers/power/supply/max77976_charger.c
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-pm@vger.kernel.org
  S:    Supported
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <cw00.choi@samsung.com>
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 +F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
 +F:    Documentation/devicetree/bindings/*/maxim,max77843.yaml
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
 -F:    Documentation/devicetree/bindings/mfd/max14577.txt
  F:    Documentation/devicetree/bindings/mfd/max77693.txt
 +F:    drivers/*/*max77843.c
  F:    drivers/*/max14577*.c
  F:    drivers/*/max77686*.c
  F:    drivers/*/max77693*.c
@@@ -11931,7 -11827,7 +11931,7 @@@ M:   Philipp Zabel <p.zabel@pengutronix.d
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/imx-pxp.[ch]
 +F:    drivers/media/platform/nxp/imx-pxp.[ch]
  
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <serjk@netup.ru>
@@@ -11996,10 -11892,10 +11996,10 @@@ L:        linux-media@vger.kernel.or
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  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:    Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
 +F:    drivers/media/platform/imx/imx-mipi-csis.c
  F:    drivers/staging/media/imx/imx7-media-csi.c
 -F:    drivers/staging/media/imx/imx7-mipi-csis.c
  
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <aospan@netup.ru>
@@@ -12054,7 -11950,7 +12054,7 @@@ L:   linux-tegra@vger.kernel.or
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 -F:    drivers/staging/media/tegra-vde/
 +F:    drivers/media/platform/nvidia/tegra-vde/
  
  MEDIA DRIVERS FOR RENESAS - CEU
  M:    Jacopo Mondi <jacopo@jmondi.org>
@@@ -12063,7 -11959,7 +12063,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,ceu.yaml
 -F:    drivers/media/platform/renesas-ceu.c
 +F:    drivers/media/platform/renesas/renesas-ceu.c
  F:    include/media/drv-intf/renesas-ceu.h
  
  MEDIA DRIVERS FOR RENESAS - DRIF
@@@ -12073,7 -11969,7 +12073,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,drif.yaml
 -F:    drivers/media/platform/rcar_drif.c
 +F:    drivers/media/platform/renesas/rcar_drif.c
  
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -12082,7 -11978,7 +12082,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fcp.yaml
 -F:    drivers/media/platform/rcar-fcp.c
 +F:    drivers/media/platform/renesas/rcar-fcp.c
  F:    include/media/rcar-fcp.h
  
  MEDIA DRIVERS FOR RENESAS - FDP1
@@@ -12092,7 -11988,7 +12092,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fdp1.yaml
 -F:    drivers/media/platform/rcar_fdp1.c
 +F:    drivers/media/platform/renesas/rcar_fdp1.c
  
  MEDIA DRIVERS FOR RENESAS - VIN
  M:    Niklas Söderlund <niklas.soderlund@ragnatech.se>
@@@ -12103,8 -11999,8 +12103,8 @@@ 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/
 +F:    drivers/media/platform/renesas/rcar-isp.c
 +F:    drivers/media/platform/renesas/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -12114,7 -12010,7 +12114,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.yaml
 -F:    drivers/media/platform/vsp1/
 +F:    drivers/media/platform/renesas/vsp1/
  
  MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
  L:    linux-media@vger.kernel.org
@@@ -12136,7 -12032,7 +12136,7 @@@ L:   linux-media@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
 -F:    drivers/media/platform/stm32/stm32-dcmi.c
 +F:    drivers/media/platform/st/stm32/stm32-dcmi.c
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
@@@ -12220,7 -12116,7 +12220,7 @@@ M:   Rick Chang <rick.chang@mediatek.com
  M:    Bin Liu <bin.liu@mediatek.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
 -F:    drivers/media/platform/mtk-jpeg/
 +F:    drivers/media/platform/mediatek/jpeg/
  
  MEDIATEK MDP DRIVER
  M:    Minghsiu Tsai <minghsiu.tsai@mediatek.com>
@@@ -12228,8 -12124,8 +12228,8 @@@ M:   Houlong Wei <houlong.wei@mediatek.co
  M:    Andrew-CT Chen <andrew-ct.chen@mediatek.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-mdp.txt
 -F:    drivers/media/platform/mtk-mdp/
 -F:    drivers/media/platform/mtk-vpu/
 +F:    drivers/media/platform/mediatek/mdp/
 +F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MEDIA DRIVER
  M:    Tiffany Lin <tiffany.lin@mediatek.com>
@@@ -12237,8 -12133,8 +12237,8 @@@ M:   Andrew-CT Chen <andrew-ct.chen@media
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
 -F:    drivers/media/platform/mtk-vcodec/
 -F:    drivers/media/platform/mtk-vpu/
 +F:    drivers/media/platform/mediatek/vcodec/
 +F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MMC/SD/SDIO DRIVER
  M:    Chaotian Jing <chaotian.jing@mediatek.com>
@@@ -12254,7 -12150,6 +12254,7 @@@ R:   Shayne Chen <shayne.chen@mediatek.co
  R:    Sean Wang <sean.wang@mediatek.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
  F:    drivers/net/wireless/mediatek/mt76/
  
  MEDIATEK MT7601U WIRELESS LAN DRIVER
@@@ -12518,7 -12413,7 +12518,7 @@@ F:   include/linux/memblock.
  F:    mm/memblock.c
  
  MEMORY CONTROLLER DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
@@@ -12614,7 -12509,7 +12614,7 @@@ L:   linux-amlogic@lists.infradead.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
 -F:    drivers/media/platform/meson/ge2d/
 +F:    drivers/media/platform/amlogic/meson-ge2d/
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <liang.yang@amlogic.com>
@@@ -12696,13 -12591,6 +12696,13 @@@ L: alsa-devel@alsa-project.org (moderat
  S:    Supported
  F:    sound/soc/atmel
  
 +MICROCHIP CSI2DC DRIVER
 +M:    Eugen Hristev <eugen.hristev@microchip.com>
 +L:    linux-media@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
 +F:    drivers/media/platform/atmel/microchip-csi2dc.c
 +
  MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
  L:    linux-crypto@vger.kernel.org
@@@ -12728,8 -12616,11 +12728,8 @@@ L:  linux-media@vger.kernel.or
  S:    Supported
  F:    Documentation/devicetree/bindings/media/atmel,isc.yaml
  F:    Documentation/devicetree/bindings/media/microchip,xisc.yaml
 -F:    drivers/media/platform/atmel/atmel-isc-base.c
 -F:    drivers/media/platform/atmel/atmel-isc-regs.h
 -F:    drivers/media/platform/atmel/atmel-isc.h
 -F:    drivers/media/platform/atmel/atmel-sama5d2-isc.c
 -F:    drivers/media/platform/atmel/atmel-sama7g5-isc.c
 +F:    drivers/media/platform/atmel/atmel-isc*
 +F:    drivers/media/platform/atmel/atmel-sama*-isc*
  F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
@@@ -13412,8 -13303,8 +13412,8 @@@ W:   http://www.iptables.org
  W:    http://www.nftables.org/
  Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
  C:    irc://irc.libera.chat/netfilter
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
  F:    include/net/netfilter/
@@@ -13470,7 -13361,6 +13470,7 @@@ F:   net/core/drop_monitor.
  NETWORKING DRIVERS
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Jakub Kicinski <kuba@kernel.org>
 +M:    Paolo Abeni <pabeni@redhat.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13517,7 -13407,6 +13517,7 @@@ F:   tools/testing/selftests/drivers/net/
  NETWORKING [GENERAL]
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Jakub Kicinski <kuba@kernel.org>
 +M:    Paolo Abeni <pabeni@redhat.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13661,7 -13550,7 +13661,7 @@@ F:   include/uapi/linux/nexthop.
  F:    net/ipv4/nexthop.c
  
  NFC SUBSYSTEM
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-nfc@lists.01.org (subscribers-only)
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -13682,7 -13571,7 +13682,7 @@@ F:   tools/testing/selftests/nci
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <trond.myklebust@hammerspace.com>
 -M:    Anna Schumaker <anna.schumaker@netapp.com>
 +M:    Anna Schumaker <anna@kernel.org>
  L:    linux-nfs@vger.kernel.org
  S:    Maintained
  W:    http://client.linux-nfs.org
@@@ -13795,7 -13684,7 +13795,7 @@@ F:   scripts/nsdep
  NTB AMD DRIVER
  M:    Sanjay R Mehta <sanju.mehta@amd.com>
  M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  F:    drivers/ntb/hw/amd/
  
@@@ -13803,7 -13692,7 +13803,7 @@@ NTB DRIVER COR
  M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
  M:    Allen Hubbe <allenbh@gmail.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -13815,13 -13704,13 +13815,13 @@@ F:        tools/testing/selftests/ntb
  
  NTB IDT DRIVER
  M:    Serge Semin <fancer.lancer@gmail.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  F:    drivers/ntb/hw/idt/
  
  NTB INTEL DRIVER
  M:    Dave Jiang <dave.jiang@intel.com>
 -L:    linux-ntb@googlegroups.com
 +L:    ntb@lists.linux.dev
  S:    Supported
  W:    https://github.com/davejiang/linux/wiki
  T:    git https://github.com/davejiang/linux.git
@@@ -13975,7 -13864,7 +13975,7 @@@ F:   Documentation/devicetree/bindings/re
  F:    drivers/regulator/pf8x00-regulator.c
  
  NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@@ -14188,7 -14077,7 +14188,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/ti,omap3isp.txt
 -F:    drivers/media/platform/omap3isp/
 +F:    drivers/media/platform/ti/omap3isp/
  F:    drivers/staging/media/omap4iss/
  
  OMAP MMC SUPPORT
@@@ -14296,12 -14185,6 +14296,12 @@@ M: Harald Welte <laforge@gnumonks.org
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OG01A1B SENSOR DRIVER
 +M:    Shawn Tu <shawnx.tu@intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/og01a1b.c
 +
  OMNIVISION OV02A10 SENSOR DRIVER
  M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
  L:    linux-media@vger.kernel.org
@@@ -14310,13 -14193,6 +14310,13 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
  F:    drivers/media/i2c/ov02a10.c
  
 +OMNIVISION OV08D10 SENSOR DRIVER
 +M:    Jimmy Su <jimmy.su@intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov08d10.c
 +
  OMNIVISION OV13858 SENSOR DRIVER
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
@@@ -14513,7 -14389,6 +14513,7 @@@ M:   Rob Herring <robh+dt@kernel.org
  M:    Frank Rowand <frowand.list@gmail.com>
  L:    devicetree@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  W:    http://www.devicetree.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/ABI/testing/sysfs-firmware-ofw
@@@ -14525,7 -14400,6 +14525,7 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Rob Herring <robh+dt@kernel.org>
  L:    devicetree@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  Q:    http://patchwork.ozlabs.org/project/devicetree-bindings/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/devicetree/
@@@ -14712,9 -14586,8 +14712,9 @@@ F:   include/uapi/linux/ppdev.
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <jgross@suse.com>
 -M:    Deep Shah <sdeep@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +M:    Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
 +R:    Alexey Makhalov <amakhalov@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    virtualization@lists.linux-foundation.org
  L:    x86@kernel.org
  S:    Supported
@@@ -15260,7 -15133,7 +15260,7 @@@ M:   Ingo Molnar <mingo@redhat.com
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  R:    Mark Rutland <mark.rutland@arm.com>
  R:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 -R:    Jiri Olsa <jolsa@redhat.com>
 +R:    Jiri Olsa <jolsa@kernel.org>
  R:    Namhyung Kim <namhyung@kernel.org>
  L:    linux-perf-users@vger.kernel.org
  L:    linux-kernel@vger.kernel.org
@@@ -15415,16 -15288,14 +15415,16 @@@ F:        drivers/pinctrl/renesas
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <tomasz.figa@gmail.com>
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +R:    Alim Akhtar <alim.akhtar@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 -F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 +F:    Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
  F:    drivers/pinctrl/samsung/
  F:    include/dt-bindings/pinctrl/samsung.h
  
@@@ -15643,7 -15514,6 +15643,7 @@@ F:   drivers/net/ppp/pptp.
  
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <hannes@cmpxchg.org>
 +M:    Suren Baghdasaryan <surenb@google.com>
  S:    Maintained
  F:    include/linux/psi*
  F:    kernel/sched/psi.c
@@@ -15679,7 -15549,6 +15679,7 @@@ M:   Iurii Zaikin <yzaikin@google.com
  L:    linux-kernel@vger.kernel.org
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl-next
  F:    fs/proc/proc_sysctl.c
  F:    include/linux/sysctl.h
  F:    kernel/sysctl-test.c
@@@ -16027,20 -15896,18 +16027,20 @@@ S:        Supporte
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath10k/
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <kvalo@kernel.org>
  L:    ath11k@lists.infradead.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
  F:    drivers/net/wireless/ath/ath11k/
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 -M:    ath9k-devel@qca.qualcomm.com
 +M:    Toke Høiland-Jørgensen <toke@toke.dk>
  L:    linux-wireless@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  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/
@@@ -16115,6 -15982,14 +16115,6 @@@ F:  Documentation/devicetree/bindings/mi
  F:    drivers/misc/fastrpc.c
  F:    include/uapi/misc/fastrpc.h
  
 -QUALCOMM GENERIC INTERFACE I2C DRIVER
 -M:    Akash Asthana <akashast@codeaurora.org>
 -M:    Mukesh Savaliya <msavaliy@codeaurora.org>
 -L:    linux-i2c@vger.kernel.org
 -L:    linux-arm-msm@vger.kernel.org
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-qcom-geni.c
 -
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Brian Cain <bcain@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
@@@ -16186,8 -16061,8 +16186,8 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
  QUALCOMM RMNET DRIVER
 -M:    Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
 -M:    Sean Tranchetti <stranche@codeaurora.org>
 +M:    Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>
 +M:    Sean Tranchetti <quic_stranche@quicinc.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
@@@ -16213,10 -16088,11 +16213,10 @@@ F:        Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@kernel.org>
 +M:    Loic Poulain <loic.poulain@linaro.org>
  L:    wcn36xx@lists.infradead.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
 -T:    git git://github.com/KrasnikovEugene/wcn36xx.git
  F:    drivers/net/wireless/ath/wcn36xx/
  
  QUANTENNA QTNFMAC WIRELESS DRIVER
@@@ -16318,7 -16194,6 +16318,7 @@@ M:   Jason A. Donenfeld <Jason@zx2c4.com
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
  S:    Maintained
  F:    drivers/char/random.c
 +F:    drivers/virt/vmgenid.c
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <mporter@kernel.crashing.org>
@@@ -16433,8 -16308,6 +16433,8 @@@ F:   tools/testing/selftests/resctrl
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <paulmck@kernel.org>
 +M:    Frederic Weisbecker <frederic@kernel.org> (kernel/rcu/tree_nocb.h)
 +M:    Neeraj Upadhyay <quic_neeraju@quicinc.com> (kernel/rcu/tasks.h)
  M:    Josh Triplett <josh@joshtriplett.org>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -16482,10 -16355,10 +16482,10 @@@ F:        drivers/watchdog/realtek_otto_wdt.
  
  REALTEK RTL83xx SMI DSA ROUTER CHIPS
  M:    Linus Walleij <linus.walleij@linaro.org>
 +M:    Alvin Šipraga <alsi@bang-olufsen.dk>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 -F:    drivers/net/dsa/realtek-smi*
 -F:    drivers/net/dsa/rtl83*
 +F:    Documentation/devicetree/bindings/net/dsa/realtek.yaml
 +F:    drivers/net/dsa/realtek/*
  
  REALTEK WIRELESS DRIVER (rtlwifi family)
  M:    Ping-Ke Shih <pkshih@realtek.com>
@@@ -16750,7 -16623,8 +16750,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/rockchip/rockchip_i2s_tdm.*
  
  ROCKCHIP ISP V1 DRIVER
 -M:    Helen Koike <helen.koike@collabora.com>
 -M:    Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
 +M:    Dafna Hirschfeld <dafna@fastmail.com>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
@@@ -17019,9 -16893,7 +17019,7 @@@ L:   linux-s390@vger.kernel.or
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
  F:    Documentation/s390/vfio-ap.rst
- F:    drivers/s390/crypto/vfio_ap_drv.c
- F:    drivers/s390/crypto/vfio_ap_ops.c
- F:    drivers/s390/crypto/vfio_ap_private.h
+ F:    drivers/s390/crypto/vfio_ap*
  
  S390 VFIO-CCW DRIVER
  M:    Eric Farman <farman@linux.ibm.com>
@@@ -17059,7 -16931,7 +17057,7 @@@ W:   http://www.ibm.com/developerworks/li
  F:    drivers/s390/scsi/zfcp_*
  
  S3C ADC BATTERY DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-samsung-soc@vger.kernel.org
  S:    Odd Fixes
  F:    drivers/power/supply/s3c_adc_battery.c
@@@ -17104,7 -16976,7 +17102,7 @@@ F:   Documentation/admin-guide/LSM/SafeSe
  F:    security/safesetid/
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
@@@ -17112,7 -16984,7 +17110,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/samsung/
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
@@@ -17147,7 -17019,7 +17145,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-kernel@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
@@@ -17169,11 -17041,11 +17167,11 @@@ M:        Sylwester Nawrocki <sylvester.nawroc
  L:    linux-media@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/platform/s3c-camif/
 +F:    drivers/media/platform/samsung/s3c-camif/
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Krzysztof Opasiak <k.opasiak@samsung.com>
  L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Maintained
@@@ -17195,7 -17067,7 +17193,7 @@@ S:   Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Vladimir Zapolskiy <vz@mleia.com>
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
@@@ -17209,13 -17081,12 +17207,13 @@@ M:        Sylwester Nawrocki <s.nawrocki@samsu
  L:    linux-media@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 -F:    drivers/media/platform/exynos4-is/
 +F:    drivers/media/platform/samsung/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  M:    Tomasz Figa <tomasz.figa@gmail.com>
  M:    Chanwoo Choi <cw00.choi@samsung.com>
 +R:    Alim Akhtar <alim.akhtar@samsung.com>
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
@@@ -17230,12 -17101,12 +17228,12 @@@ F:        include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
 -M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Andi Shyti <andi@etezian.org>
  L:    linux-spi@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 +F:    Documentation/devicetree/bindings/spi/samsung,spi*.yaml
  F:    drivers/spi/spi-s3c*
  F:    include/linux/platform_data/spi-s3c64xx.h
  F:    include/linux/spi/s3c24xx-fiq.h
@@@ -17247,12 -17118,11 +17245,12 @@@ S:        Supporte
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
 -M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +M:    Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
 -S:    Supported
 -T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
@@@ -17644,7 -17514,7 +17642,7 @@@ F:   include/media/i2c/rj54n1cb0c.
  SH_VOU V4L2 OUTPUT DRIVER
  L:    linux-media@vger.kernel.org
  S:    Orphan
 -F:    drivers/media/platform/sh_vou.c
 +F:    drivers/media/platform/renesas/sh_vou.c
  F:    include/media/drv-intf/sh_vou.h
  
  SI2157 MEDIA DRIVER
@@@ -17853,21 -17723,6 +17851,21 @@@ S: Maintaine
  W:    http://www.winischhofer.at/linuxsisusbvga.shtml
  F:    drivers/usb/misc/sisusbvga/
  
 +SL28 CPLD MFD DRIVER
 +M:    Michael Walle <michael@walle.cc>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
 +F:    Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
 +F:    Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
 +F:    Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml
 +F:    Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml
 +F:    drivers/gpio/gpio-sl28cpld.c
 +F:    drivers/hwmon/sl28cpld-hwmon.c
 +F:    drivers/irqchip/irq-sl28cpld.c
 +F:    drivers/pwm/pwm-sl28cpld.c
 +F:    drivers/watchdog/sl28cpld_wdt.c
 +
  SLAB ALLOCATOR
  M:    Christoph Lameter <cl@linux.com>
  M:    Pekka Enberg <penberg@kernel.org>
@@@ -17875,10 -17730,8 +17873,10 @@@ M: David Rientjes <rientjes@google.com
  M:    Joonsoo Kim <iamjoonsoo.kim@lge.com>
  M:    Andrew Morton <akpm@linux-foundation.org>
  M:    Vlastimil Babka <vbabka@suse.cz>
 +R:    Roman Gushchin <roman.gushchin@linux.dev>
  L:    linux-mm@kvack.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
  F:    include/linux/sl?b*.h
  F:    mm/sl?b*
  
@@@ -18416,8 -18269,7 +18414,8 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/imu/st_lsm6dsx/
  
  ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
 -M:    Mickael Guene <mickael.guene@st.com>
 +M:    Benjamin Mugnier <benjamin.mugnier@foss.st.com>
 +M:    Sylvain Petinot <sylvain.petinot@foss.st.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -18587,7 -18439,7 +18585,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/sti/
  
  STI CEC DRIVER
 -M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +M:    Alain Volmat <alain.volmat@foss.st.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
  F:    drivers/media/cec/platform/sti/
@@@ -18656,13 -18508,6 +18654,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
  F:    drivers/rtc/rtc-sunplus.c
  
 +SUNPLUS SPI CONTROLLER INTERFACE DRIVER
 +M:    Li-hao Kuo <lhjeff911@gmail.com>
 +L:    linux-spi@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
 +F:    drivers/spi/spi-sunplus-sp7021.c
 +
  SUPERH
  M:    Yoshinori Sato <ysato@users.sourceforge.jp>
  M:    Rich Felker <dalias@libc.org>
@@@ -19214,7 -19059,6 +19212,7 @@@ TEXAS INSTRUMENTS ASoC DRIVER
  M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
  F:    sound/soc/ti/
  
  TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
@@@ -19395,7 -19239,7 +19393,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -F:    drivers/media/platform/am437x/
 +F:    drivers/media/platform/ti/am437x/
  
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <edubezval@gmail.com>
@@@ -19454,7 -19298,7 +19452,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -F:    drivers/media/platform/davinci/
 +F:    drivers/media/platform/ti/davinci/
  F:    include/media/davinci/
  
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@@ -19540,8 -19384,7 +19538,8 @@@ W:   http://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    Documentation/devicetree/bindings/media/ti,cal.yaml
  F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
 -F:    drivers/media/platform/ti-vpe/
 +F:    drivers/media/platform/ti/cal/
 +F:    drivers/media/platform/ti/vpe/
  
  TI WILINK WIRELESS DRIVERS
  L:    linux-wireless@vger.kernel.org
@@@ -19612,15 -19455,6 +19610,15 @@@ S: Maintaine
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
 +TMP464 HARDWARE MONITOR DRIVER
 +M:    Agathe Porte <agathe.porte@nokia.com>
 +M:    Guenter Roeck <linux@roeck-us.net>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml
 +F:    Documentation/hwmon/tmp464.rst
 +F:    drivers/hwmon/tmp464.c
 +
  TMP513 HARDWARE MONITOR DRIVER
  M:    Eric Tremblay <etremblay@distech-controls.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -19759,14 -19593,6 +19757,14 @@@ F: Documentation/trace/timerlat-tracer.
  F:    Documentation/trace/hwlat_detector.rst
  F:    arch/*/kernel/trace.c
  
 +Real-time Linux Analysis (RTLA) tools
 +M:    Daniel Bristot de Oliveira <bristot@kernel.org>
 +M:    Steven Rostedt <rostedt@goodmis.org>
 +L:    linux-trace-devel@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/tools/rtla/
 +F:    tools/tracing/rtla/
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <src.res@email.cn>
  L:    linux-doc-tw-discuss@lists.sourceforge.net
@@@ -20436,13 -20262,6 +20434,13 @@@ L: kvm@vger.kernel.or
  S:    Maintained
  F:    drivers/vfio/fsl-mc/
  
 +VFIO HISILICON PCI DRIVER
 +M:    Longfang Liu <liulongfang@huawei.com>
 +M:    Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
 +L:    kvm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/vfio/pci/hisilicon/
 +
  VFIO MEDIATED DEVICE DRIVERS
  M:    Kirti Wankhede <kwankhede@nvidia.com>
  L:    kvm@vger.kernel.org
@@@ -20452,28 -20271,12 +20450,28 @@@ F:        drivers/vfio/mdev
  F:    include/linux/mdev.h
  F:    samples/vfio-mdev/
  
 +VFIO PCI DEVICE SPECIFIC DRIVERS
 +R:    Jason Gunthorpe <jgg@nvidia.com>
 +R:    Yishai Hadas <yishaih@nvidia.com>
 +R:    Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
 +R:    Kevin Tian <kevin.tian@intel.com>
 +L:    kvm@vger.kernel.org
 +S:    Maintained
 +P:    Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst
 +F:    drivers/vfio/pci/*/
 +
  VFIO PLATFORM DRIVER
  M:    Eric Auger <eric.auger@redhat.com>
  L:    kvm@vger.kernel.org
  S:    Maintained
  F:    drivers/vfio/platform/
  
 +VFIO MLX5 PCI DRIVER
 +M:    Yishai Hadas <yishaih@nvidia.com>
 +L:    kvm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/vfio/pci/mlx5/
 +
  VGA_SWITCHEROO
  R:    Lukas Wunner <lukas@wunner.de>
  S:    Maintained
@@@ -20537,8 -20340,8 +20535,8 @@@ F:   drivers/media/common/videobuf2/
  F:    include/media/videobuf2-*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 -M:    Helen Koike <helen.koike@collabora.com>
 -R:    Shuah Khan <skhan@linuxfoundation.org>
 +M:    Shuah Khan <skhan@linuxfoundation.org>
 +R:    Kieran Bingham <kieran.bingham@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  W:    https://linuxtv.org
@@@ -20793,33 -20596,30 +20791,33 @@@ F:        tools/testing/vsock
  
  VMWARE BALLOON DRIVER
  M:    Nadav Amit <namit@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
 -M:    Deep Shah <sdeep@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +M:    Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
 +M:    Alexey Makhalov <amakhalov@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    virtualization@lists.linux-foundation.org
 +L:    x86@kernel.org
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vmware
  F:    arch/x86/include/asm/vmware.h
  F:    arch/x86/kernel/cpu/vmware.c
  
  VMWARE PVRDMA DRIVER
  M:    Bryan Tan <bryantan@vmware.com>
  M:    Vishnu Dasa <vdasa@vmware.com>
 -M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
  F:    drivers/infiniband/hw/vmw_pvrdma/
  
  VMware PVSCSI driver
  M:    Vishal Bhakta <vbhakta@vmware.com>
 -M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/vmw_pvscsi.c
@@@ -20827,7 -20627,7 +20825,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
  M:    Vivek Thampi <vithampi@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/ptp/ptp_vmw.c
  VMWARE VMCI DRIVER
  M:    Jorgen Hansen <jhansen@vmware.com>
  M:    Vishnu Dasa <vdasa@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-kernel@vger.kernel.org
 -L:    pv-drivers@vmware.com (private)
  S:    Maintained
  F:    drivers/misc/vmw_vmci/
  
  VMWARE VMMOUSE SUBDRIVER
 -M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
 -M:    "VMware, Inc." <pv-drivers@vmware.com>
 +M:    Zack Rusin <zackr@vmware.com>
 +R:    VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
  F:    drivers/input/mouse/vmmouse.c
@@@ -20851,7 -20650,7 +20849,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <doshir@vmware.com>
 -M:    pv-drivers@vmware.com
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -21227,7 -21026,7 +21225,7 @@@ L:   linux-media@vger.kernel.or
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/tuners/tuner-xc2028.*
 +F:    drivers/media/tuners/xc2028.*
  
  XDP (eXpress Data Path)
  M:    Alexei Starovoitov <ast@kernel.org>
@@@ -21447,11 -21246,6 +21445,11 @@@ T: git https://github.com/Xilinx/linux-
  F:    Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
  F:    drivers/phy/xilinx/phy-zynqmp.c
  
 +XILINX ZYNQMP SHA3 DRIVER
 +M:    Harsha <harsha.harsha@xilinx.com>
 +S:    Maintained
 +F:    drivers/crypto/xilinx/zynqmp-sha.c
 +
  XILINX EVENT MANAGEMENT DRIVER
  M:    Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
  S:    Maintained
@@@ -21632,6 -21426,7 +21630,6 @@@ THE RES
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
  S:    Buried alive in reporters
 -Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  F:    *
  F:    */
diff --combined arch/s390/Kconfig
@@@ -55,13 -55,11 +55,13 @@@ config S39
        # Note: keep this list sorted alphabetically
        #
        imply IMA_SECURE_AND_OR_TRUSTED_BOOT
 +      select ALTERNATE_USER_ADDRESS_SPACE
        select ARCH_32BIT_USTAT_F_TINODE
        select ARCH_BINFMT_ELF_STATE
        select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM
        select ARCH_ENABLE_MEMORY_HOTREMOVE
        select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
 +      select ARCH_HAS_CURRENT_STACK_POINTER
        select ARCH_HAS_DEBUG_VM_PGTABLE
        select ARCH_HAS_DEBUG_WX
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_WANT_IPC_PARSE_VERSION
        select BUILDTIME_TABLE_SORT
        select CLONE_BACKWARDS2
-       select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES
        select DMA_OPS if PCI
        select DYNAMIC_FTRACE if FUNCTION_TRACER
        select GENERIC_ALLOCATOR
        select HAVE_DYNAMIC_FTRACE_WITH_ARGS
        select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
-       select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
+       select HAVE_EBPF_JIT if HAVE_MARCH_Z196_FEATURES
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
        select HAVE_FAST_GUP
        select HAVE_FENTRY
@@@ -232,20 -229,8 +231,8 @@@ source "kernel/livepatch/Kconfig
  
  menu "Processor type and features"
  
- config HAVE_MARCH_Z900_FEATURES
-       def_bool n
- config HAVE_MARCH_Z990_FEATURES
-       def_bool n
-       select HAVE_MARCH_Z900_FEATURES
- config HAVE_MARCH_Z9_109_FEATURES
-       def_bool n
-       select HAVE_MARCH_Z990_FEATURES
  config HAVE_MARCH_Z10_FEATURES
        def_bool n
-       select HAVE_MARCH_Z9_109_FEATURES
  
  config HAVE_MARCH_Z196_FEATURES
        def_bool n
@@@ -271,41 -256,13 +258,13 @@@ choic
        prompt "Processor type"
        default MARCH_Z196
  
- config MARCH_Z900
-       bool "IBM zSeries model z800 and z900"
-       select HAVE_MARCH_Z900_FEATURES
-       depends on $(cc-option,-march=z900)
-       help
-         Select this to enable optimizations for model z800/z900 (2064 and
-         2066 series). This will enable some optimizations that are not
-         available on older ESA/390 (31 Bit) only CPUs.
- config MARCH_Z990
-       bool "IBM zSeries model z890 and z990"
-       select HAVE_MARCH_Z990_FEATURES
-       depends on $(cc-option,-march=z990)
-       help
-         Select this to enable optimizations for model z890/z990 (2084 and
-         2086 series). The kernel will be slightly faster but will not work
-         on older machines.
- config MARCH_Z9_109
-       bool "IBM System z9"
-       select HAVE_MARCH_Z9_109_FEATURES
-       depends on $(cc-option,-march=z9-109)
-       help
-         Select this to enable optimizations for IBM System z9 (2094 and
-         2096 series). The kernel will be slightly faster but will not work
-         on older machines.
  config MARCH_Z10
        bool "IBM System z10"
        select HAVE_MARCH_Z10_FEATURES
        depends on $(cc-option,-march=z10)
        help
-         Select this to enable optimizations for IBM System z10 (2097 and
-         2098 series). The kernel will be slightly faster but will not work
-         on older machines.
+         Select this to enable optimizations for IBM System z10 (2097 and 2098
+         series). This is the oldest machine generation currently supported.
  
  config MARCH_Z196
        bool "IBM zEnterprise 114 and 196"
@@@ -354,15 -311,6 +313,6 @@@ config MARCH_Z1
  
  endchoice
  
- config MARCH_Z900_TUNE
-       def_bool TUNE_Z900 || MARCH_Z900 && TUNE_DEFAULT
- config MARCH_Z990_TUNE
-       def_bool TUNE_Z990 || MARCH_Z990 && TUNE_DEFAULT
- config MARCH_Z9_109_TUNE
-       def_bool TUNE_Z9_109 || MARCH_Z9_109 && TUNE_DEFAULT
  config MARCH_Z10_TUNE
        def_bool TUNE_Z10 || MARCH_Z10 && TUNE_DEFAULT
  
@@@ -398,21 -346,8 +348,8 @@@ config TUNE_DEFAUL
          Tune the generated code for the target processor for which the kernel
          will be compiled.
  
- config TUNE_Z900
-       bool "IBM zSeries model z800 and z900"
-       depends on $(cc-option,-mtune=z900)
- config TUNE_Z990
-       bool "IBM zSeries model z890 and z990"
-       depends on $(cc-option,-mtune=z990)
- config TUNE_Z9_109
-       bool "IBM System z9"
-       depends on $(cc-option,-mtune=z9-109)
  config TUNE_Z10
        bool "IBM System z10"
-       depends on $(cc-option,-mtune=z10)
  
  config TUNE_Z196
        bool "IBM zEnterprise 114 and 196"
@@@ -587,6 -522,7 +524,7 @@@ config KERNEL_NOB
  
  config EXPOLINE
        def_bool n
+       depends on $(cc-option,-mindirect-branch=thunk)
        prompt "Avoid speculative indirect branches in the kernel"
        help
          Compile the kernel with the expoline compiler options to guard
  
          If unsure, say N.
  
+ config EXPOLINE_EXTERN
+       def_bool n
+       depends on EXPOLINE
+       depends on CC_IS_GCC && GCC_VERSION >= 110200
+       depends on $(success,$(srctree)/arch/s390/tools/gcc-thunk-extern.sh $(CC))
+       prompt "Generate expolines as extern functions."
+       help
+         This option is required for some tooling like kpatch. The kernel is
+         compiled with -mindirect-branch=thunk-extern and requires a newer
+         compiler.
+         If unsure, say N.
  choice
        prompt "Expoline default"
        depends on EXPOLINE
@@@ -658,20 -607,6 +609,6 @@@ config MAX_PHYSMEM_BIT
          Increasing the number of bits also increases the kernel image size.
          By default 46 bits (64TB) are supported.
  
- config PACK_STACK
-       def_bool y
-       prompt "Pack kernel stack"
-       help
-         This option enables the compiler option -mkernel-backchain if it
-         is available. If the option is available the compiler supports
-         the new stack layout which dramatically reduces the minimum stack
-         frame size. With an old compiler a non-leaf function needs a
-         minimum of 96 bytes on 31 bit and 160 bytes on 64 bit. With
-         -mkernel-backchain the minimum size drops to 16 byte on 31 bit
-         and 24 byte on 64 bit.
-         Say Y if you are unsure.
  config CHECK_STACK
        def_bool y
        depends on !VMAP_STACK
@@@ -20,8 -20,6 +20,8 @@@
  #define PAGE_SIZE     _PAGE_SIZE
  #define PAGE_MASK     _PAGE_MASK
  #define PAGE_DEFAULT_ACC      0
 +/* storage-protection override */
 +#define PAGE_SPO_ACC          9
  #define PAGE_DEFAULT_KEY      (PAGE_DEFAULT_ACC << 4)
  
  #define HPAGE_SHIFT   20
@@@ -92,11 -90,31 +92,31 @@@ typedef pte_t *pgtable_t
  
  #define pgprot_val(x) ((x).pgprot)
  #define pgste_val(x)  ((x).pgste)
- #define pte_val(x)    ((x).pte)
- #define pmd_val(x)    ((x).pmd)
- #define pud_val(x)    ((x).pud)
- #define p4d_val(x)    ((x).p4d)
- #define pgd_val(x)      ((x).pgd)
+ static inline unsigned long pte_val(pte_t pte)
+ {
+       return pte.pte;
+ }
+ static inline unsigned long pmd_val(pmd_t pmd)
+ {
+       return pmd.pmd;
+ }
+ static inline unsigned long pud_val(pud_t pud)
+ {
+       return pud.pud;
+ }
+ static inline unsigned long p4d_val(p4d_t p4d)
+ {
+       return p4d.p4d;
+ }
+ static inline unsigned long pgd_val(pgd_t pgd)
+ {
+       return pgd.pgd;
+ }
  
  #define __pgste(x)    ((pgste_t) { (x) } )
  #define __pte(x)        ((pte_t) { (x) } )
@@@ -1,7 -1,6 +1,6 @@@
  /* SPDX-License-Identifier: GPL-2.0 */
  /*
   *    Copyright IBM Corp. 2007
-  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
   */
  
  #ifndef _ASM_S390_SCLP_H
@@@ -112,7 -111,7 +111,7 @@@ struct zpci_report_error_header 
                         *      (OpenCrypto Successful Diagnostics Execution)
                         */
        u16 length;     /* Length of Subsequent Data (up to 4K – SCLP header */
 -      u8 data[0];     /* Subsequent Data passed verbatim to SCLP ET 24 */
 +      u8 data[];      /* Subsequent Data passed verbatim to SCLP ET 24 */
  } __packed;
  
  extern char *sclp_early_sccb;
  /*
   * User space memory access functions
   */
+ #include <asm/asm-extable.h>
  #include <asm/processor.h>
  #include <asm/ctl_reg.h>
  #include <asm/extable.h>
  #include <asm/facility.h>
 +#include <asm-generic/access_ok.h>
  
  void debug_user_asce(int exit);
  
 -static inline int __range_ok(unsigned long addr, unsigned long size)
 -{
 -      return 1;
 -}
 -
 -#define __access_ok(addr, size)                               \
 -({                                                    \
 -      __chk_user_ptr(addr);                           \
 -      __range_ok((unsigned long)(addr), (size));      \
 -})
 -
 -#define access_ok(addr, size) __access_ok(addr, size)
 -
  unsigned long __must_check
  raw_copy_from_user(void *to, const void __user *from, unsigned long n);
  
@@@ -79,8 -92,6 +80,6 @@@ union oac 
        };
  };
  
- #ifdef CONFIG_HAVE_MARCH_Z10_FEATURES
  #define __put_get_user_asm(to, from, size, oac_spec)                  \
  ({                                                                    \
        int __rc;                                                       \
                "0:     mvcos   %[_to],%[_from],%[_size]\n"             \
                "1:     xr      %[rc],%[rc]\n"                          \
                "2:\n"                                                  \
-               ".pushsection .fixup, \"ax\"\n"                         \
-               "3:     lhi     %[rc],%[retval]\n"                      \
-               "       jg      2b\n"                                   \
-               ".popsection\n"                                         \
-               EX_TABLE(0b,3b) EX_TABLE(1b,3b)                         \
+               EX_TABLE_UA(0b,2b,%[rc]) EX_TABLE_UA(1b,2b,%[rc])       \
                : [rc] "=&d" (__rc), [_to] "+Q" (*(to))                 \
                : [_size] "d" (size), [_from] "Q" (*(from)),            \
-                 [retval] "K" (-EFAULT), [spec] "d" (oac_spec.val)     \
+                 [spec] "d" (oac_spec.val)                             \
                : "cc", "0");                                           \
        __rc;                                                           \
  })
@@@ -178,22 -185,6 +173,6 @@@ static __always_inline int __get_user_f
        return rc;
  }
  
- #else /* CONFIG_HAVE_MARCH_Z10_FEATURES */
- static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)
- {
-       size = raw_copy_to_user(ptr, x, size);
-       return size ? -EFAULT : 0;
- }
- static inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size)
- {
-       size = raw_copy_from_user(x, ptr, size);
-       return size ? -EFAULT : 0;
- }
- #endif /* CONFIG_HAVE_MARCH_Z10_FEATURES */
  /*
   * These are the main single-value transfer routines.  They automatically
   * use the right size if we just have the right pointer type.
@@@ -289,9 -280,11 +268,9 @@@ static inline unsigned long __must_chec
        return __clear_user(to, n);
  }
  
- int copy_to_user_real(void __user *dest, void *src, unsigned long count);
+ int copy_to_user_real(void __user *dest, unsigned long src, unsigned long count);
  void *s390_kernel_write(void *dst, const void *src, size_t size);
  
 -#define HAVE_GET_KERNEL_NOFAULT
 -
  int __noreturn __put_kernel_bad(void);
  
  #define __put_kernel_asm(val, to, insn)                                       \
                "0:   " insn "  %2,%1\n"                                \
                "1:     xr      %0,%0\n"                                \
                "2:\n"                                                  \
-               ".pushsection .fixup, \"ax\"\n"                         \
-               "3:     lhi     %0,%3\n"                                \
-               "       jg      2b\n"                                   \
-               ".popsection\n"                                         \
-               EX_TABLE(0b,3b) EX_TABLE(1b,3b)                         \
+               EX_TABLE_UA(0b,2b,%0) EX_TABLE_UA(1b,2b,%0)             \
                : "=d" (__rc), "+Q" (*(to))                             \
-               : "d" (val), "K" (-EFAULT)                              \
+               : "d" (val)                                             \
                : "cc");                                                \
        __rc;                                                           \
  })
@@@ -349,13 -338,9 +324,9 @@@ int __noreturn __get_kernel_bad(void)
                "0:   " insn "  %1,%2\n"                                \
                "1:     xr      %0,%0\n"                                \
                "2:\n"                                                  \
-               ".pushsection .fixup, \"ax\"\n"                         \
-               "3:     lhi     %0,%3\n"                                \
-               "       jg      2b\n"                                   \
-               ".popsection\n"                                         \
-               EX_TABLE(0b,3b) EX_TABLE(1b,3b)                         \
+               EX_TABLE_UA(0b,2b,%0) EX_TABLE_UA(1b,2b,%0)             \
                : "=d" (__rc), "+d" (val)                               \
-               : "Q" (*(from)), "K" (-EFAULT)                          \
+               : "Q" (*(from))                                         \
                : "cc");                                                \
        __rc;                                                           \
  })
diff --combined arch/s390/kvm/kvm-s390.c
@@@ -6,7 -6,6 +6,6 @@@
   *
   *    Author(s): Carsten Otte <cotte@de.ibm.com>
   *               Christian Borntraeger <borntraeger@de.ibm.com>
-  *               Heiko Carstens <heiko.carstens@de.ibm.com>
   *               Christian Ehrhardt <ehrhardt@de.ibm.com>
   *               Jason J. Herne <jjherne@us.ibm.com>
   */
@@@ -564,7 -563,6 +563,7 @@@ int kvm_vm_ioctl_check_extension(struc
        case KVM_CAP_S390_VCPU_RESETS:
        case KVM_CAP_SET_GUEST_DEBUG:
        case KVM_CAP_S390_DIAG318:
 +      case KVM_CAP_S390_MEM_OP_EXTENSION:
                r = 1;
                break;
        case KVM_CAP_SET_GUEST_DEBUG2:
@@@ -2195,9 -2193,6 +2194,9 @@@ static int kvm_s390_cpus_from_pv(struc
                }
                mutex_unlock(&vcpu->mutex);
        }
 +      /* Ensure that we re-enable gisa if the non-PV guest used it but the PV guest did not. */
 +      if (use_gisa)
 +              kvm_s390_gisa_enable(kvm);
        return ret;
  }
  
@@@ -2209,10 -2204,6 +2208,10 @@@ static int kvm_s390_cpus_to_pv(struct k
  
        struct kvm_vcpu *vcpu;
  
 +      /* Disable the GISA if the ultravisor does not support AIV. */
 +      if (!test_bit_inv(BIT_UV_FEAT_AIV, &uv_info.uv_feature_indications))
 +              kvm_s390_gisa_disable(kvm);
 +
        kvm_for_each_vcpu(i, vcpu, kvm) {
                mutex_lock(&vcpu->mutex);
                r = kvm_s390_pv_create_cpu(vcpu, rc, rrc);
@@@ -2367,83 -2358,6 +2366,83 @@@ static int kvm_s390_handle_pv(struct kv
        return r;
  }
  
 +static bool access_key_invalid(u8 access_key)
 +{
 +      return access_key > 0xf;
 +}
 +
 +static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem_op *mop)
 +{
 +      void __user *uaddr = (void __user *)mop->buf;
 +      u64 supported_flags;
 +      void *tmpbuf = NULL;
 +      int r, srcu_idx;
 +
 +      supported_flags = KVM_S390_MEMOP_F_SKEY_PROTECTION
 +                        | KVM_S390_MEMOP_F_CHECK_ONLY;
 +      if (mop->flags & ~supported_flags || !mop->size)
 +              return -EINVAL;
 +      if (mop->size > MEM_OP_MAX_SIZE)
 +              return -E2BIG;
 +      if (kvm_s390_pv_is_protected(kvm))
 +              return -EINVAL;
 +      if (mop->flags & KVM_S390_MEMOP_F_SKEY_PROTECTION) {
 +              if (access_key_invalid(mop->key))
 +                      return -EINVAL;
 +      } else {
 +              mop->key = 0;
 +      }
 +      if (!(mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY)) {
 +              tmpbuf = vmalloc(mop->size);
 +              if (!tmpbuf)
 +                      return -ENOMEM;
 +      }
 +
 +      srcu_idx = srcu_read_lock(&kvm->srcu);
 +
 +      if (kvm_is_error_gpa(kvm, mop->gaddr)) {
 +              r = PGM_ADDRESSING;
 +              goto out_unlock;
 +      }
 +
 +      switch (mop->op) {
 +      case KVM_S390_MEMOP_ABSOLUTE_READ: {
 +              if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {
 +                      r = check_gpa_range(kvm, mop->gaddr, mop->size, GACC_FETCH, mop->key);
 +              } else {
 +                      r = access_guest_abs_with_key(kvm, mop->gaddr, tmpbuf,
 +                                                    mop->size, GACC_FETCH, mop->key);
 +                      if (r == 0) {
 +                              if (copy_to_user(uaddr, tmpbuf, mop->size))
 +                                      r = -EFAULT;
 +                      }
 +              }
 +              break;
 +      }
 +      case KVM_S390_MEMOP_ABSOLUTE_WRITE: {
 +              if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {
 +                      r = check_gpa_range(kvm, mop->gaddr, mop->size, GACC_STORE, mop->key);
 +              } else {
 +                      if (copy_from_user(tmpbuf, uaddr, mop->size)) {
 +                              r = -EFAULT;
 +                              break;
 +                      }
 +                      r = access_guest_abs_with_key(kvm, mop->gaddr, tmpbuf,
 +                                                    mop->size, GACC_STORE, mop->key);
 +              }
 +              break;
 +      }
 +      default:
 +              r = -EINVAL;
 +      }
 +
 +out_unlock:
 +      srcu_read_unlock(&kvm->srcu, srcu_idx);
 +
 +      vfree(tmpbuf);
 +      return r;
 +}
 +
  long kvm_arch_vm_ioctl(struct file *filp,
                       unsigned int ioctl, unsigned long arg)
  {
                }
                break;
        }
 +      case KVM_S390_MEM_OP: {
 +              struct kvm_s390_mem_op mem_op;
 +
 +              if (copy_from_user(&mem_op, argp, sizeof(mem_op)) == 0)
 +                      r = kvm_s390_vm_mem_op(kvm, &mem_op);
 +              else
 +                      r = -EFAULT;
 +              break;
 +      }
        default:
                r = -ENOTTY;
        }
@@@ -3357,7 -3262,9 +3356,7 @@@ int kvm_arch_vcpu_create(struct kvm_vcp
  
        vcpu->arch.sie_block->icpua = vcpu->vcpu_id;
        spin_lock_init(&vcpu->arch.local_int.lock);
 -      vcpu->arch.sie_block->gd = (u32)(u64)vcpu->kvm->arch.gisa_int.origin;
 -      if (vcpu->arch.sie_block->gd && sclp.has_gisaf)
 -              vcpu->arch.sie_block->gd |= GISA_FORMAT1;
 +      vcpu->arch.sie_block->gd = kvm_s390_get_gisa_desc(vcpu->kvm);
        seqcount_init(&vcpu->arch.cputm_seqcount);
  
        vcpu->arch.pfault_token = KVM_S390_PFAULT_TOKEN_INVALID;
@@@ -3486,7 -3393,7 +3485,7 @@@ static void kvm_gmap_notifier(struct gm
                if (prefix <= end && start <= prefix + 2*PAGE_SIZE - 1) {
                        VCPU_EVENT(vcpu, 2, "gmap notifier for %lx-%lx",
                                   start, end);
 -                      kvm_s390_sync_request(KVM_REQ_MMU_RELOAD, vcpu);
 +                      kvm_s390_sync_request(KVM_REQ_REFRESH_GUEST_PREFIX, vcpu);
                }
        }
  }
@@@ -3888,19 -3795,19 +3887,19 @@@ retry
        if (!kvm_request_pending(vcpu))
                return 0;
        /*
 -       * We use MMU_RELOAD just to re-arm the ipte notifier for the
 +       * If the guest prefix changed, re-arm the ipte notifier for the
         * guest prefix page. gmap_mprotect_notify will wait on the ptl lock.
         * This ensures that the ipte instruction for this request has
         * already finished. We might race against a second unmapper that
         * wants to set the blocking bit. Lets just retry the request loop.
         */
 -      if (kvm_check_request(KVM_REQ_MMU_RELOAD, vcpu)) {
 +      if (kvm_check_request(KVM_REQ_REFRESH_GUEST_PREFIX, vcpu)) {
                int rc;
                rc = gmap_mprotect_notify(vcpu->arch.gmap,
                                          kvm_s390_get_prefix(vcpu),
                                          PAGE_SIZE * 2, PROT_WRITE);
                if (rc) {
 -                      kvm_make_request(KVM_REQ_MMU_RELOAD, vcpu);
 +                      kvm_make_request(KVM_REQ_REFRESH_GUEST_PREFIX, vcpu);
                        return rc;
                }
                goto retry;
        return 0;
  }
  
 -void kvm_s390_set_tod_clock(struct kvm *kvm,
 -                          const struct kvm_s390_vm_tod_clock *gtod)
 +static void __kvm_s390_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_tod_clock *gtod)
  {
        struct kvm_vcpu *vcpu;
        union tod_clock clk;
        unsigned long i;
  
 -      mutex_lock(&kvm->lock);
        preempt_disable();
  
        store_tod_clock_ext(&clk);
  
        kvm_s390_vcpu_unblock_all(kvm);
        preempt_enable();
 +}
 +
 +void kvm_s390_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_tod_clock *gtod)
 +{
 +      mutex_lock(&kvm->lock);
 +      __kvm_s390_set_tod_clock(kvm, gtod);
 +      mutex_unlock(&kvm->lock);
 +}
 +
 +int kvm_s390_try_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_tod_clock *gtod)
 +{
 +      if (!mutex_trylock(&kvm->lock))
 +              return 0;
 +      __kvm_s390_set_tod_clock(kvm, gtod);
        mutex_unlock(&kvm->lock);
 +      return 1;
  }
  
  /**
@@@ -4760,8 -4654,8 +4759,8 @@@ static int kvm_vcpu_ioctl_enable_cap(st
        return r;
  }
  
 -static long kvm_s390_guest_sida_op(struct kvm_vcpu *vcpu,
 -                                 struct kvm_s390_mem_op *mop)
 +static long kvm_s390_vcpu_sida_op(struct kvm_vcpu *vcpu,
 +                                struct kvm_s390_mem_op *mop)
  {
        void __user *uaddr = (void __user *)mop->buf;
        int r = 0;
                return -EINVAL;
        if (mop->size + mop->sida_offset > sida_size(vcpu->arch.sie_block))
                return -E2BIG;
 +      if (!kvm_s390_pv_cpu_is_protected(vcpu))
 +              return -EINVAL;
  
        switch (mop->op) {
        case KVM_S390_MEMOP_SIDA_READ:
        }
        return r;
  }
 -static long kvm_s390_guest_mem_op(struct kvm_vcpu *vcpu,
 -                                struct kvm_s390_mem_op *mop)
 +
 +static long kvm_s390_vcpu_mem_op(struct kvm_vcpu *vcpu,
 +                               struct kvm_s390_mem_op *mop)
  {
        void __user *uaddr = (void __user *)mop->buf;
        void *tmpbuf = NULL;
        int r = 0;
        const u64 supported_flags = KVM_S390_MEMOP_F_INJECT_EXCEPTION
 -                                  | KVM_S390_MEMOP_F_CHECK_ONLY;
 +                                  | KVM_S390_MEMOP_F_CHECK_ONLY
 +                                  | KVM_S390_MEMOP_F_SKEY_PROTECTION;
  
        if (mop->flags & ~supported_flags || mop->ar >= NUM_ACRS || !mop->size)
                return -EINVAL;
 -
        if (mop->size > MEM_OP_MAX_SIZE)
                return -E2BIG;
 -
        if (kvm_s390_pv_cpu_is_protected(vcpu))
                return -EINVAL;
 -
 +      if (mop->flags & KVM_S390_MEMOP_F_SKEY_PROTECTION) {
 +              if (access_key_invalid(mop->key))
 +                      return -EINVAL;
 +      } else {
 +              mop->key = 0;
 +      }
        if (!(mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY)) {
                tmpbuf = vmalloc(mop->size);
                if (!tmpbuf)
        switch (mop->op) {
        case KVM_S390_MEMOP_LOGICAL_READ:
                if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {
 -                      r = check_gva_range(vcpu, mop->gaddr, mop->ar,
 -                                          mop->size, GACC_FETCH);
 +                      r = check_gva_range(vcpu, mop->gaddr, mop->ar, mop->size,
 +                                          GACC_FETCH, mop->key);
                        break;
                }
 -              r = read_guest(vcpu, mop->gaddr, mop->ar, tmpbuf, mop->size);
 +              r = read_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,
 +                                      mop->size, mop->key);
                if (r == 0) {
                        if (copy_to_user(uaddr, tmpbuf, mop->size))
                                r = -EFAULT;
                break;
        case KVM_S390_MEMOP_LOGICAL_WRITE:
                if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {
 -                      r = check_gva_range(vcpu, mop->gaddr, mop->ar,
 -                                          mop->size, GACC_STORE);
 +                      r = check_gva_range(vcpu, mop->gaddr, mop->ar, mop->size,
 +                                          GACC_STORE, mop->key);
                        break;
                }
                if (copy_from_user(tmpbuf, uaddr, mop->size)) {
                        r = -EFAULT;
                        break;
                }
 -              r = write_guest(vcpu, mop->gaddr, mop->ar, tmpbuf, mop->size);
 +              r = write_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,
 +                                       mop->size, mop->key);
                break;
        }
  
        return r;
  }
  
 -static long kvm_s390_guest_memsida_op(struct kvm_vcpu *vcpu,
 -                                    struct kvm_s390_mem_op *mop)
 +static long kvm_s390_vcpu_memsida_op(struct kvm_vcpu *vcpu,
 +                                   struct kvm_s390_mem_op *mop)
  {
        int r, srcu_idx;
  
        switch (mop->op) {
        case KVM_S390_MEMOP_LOGICAL_READ:
        case KVM_S390_MEMOP_LOGICAL_WRITE:
 -              r = kvm_s390_guest_mem_op(vcpu, mop);
 +              r = kvm_s390_vcpu_mem_op(vcpu, mop);
                break;
        case KVM_S390_MEMOP_SIDA_READ:
        case KVM_S390_MEMOP_SIDA_WRITE:
                /* we are locked against sida going away by the vcpu->mutex */
 -              r = kvm_s390_guest_sida_op(vcpu, mop);
 +              r = kvm_s390_vcpu_sida_op(vcpu, mop);
                break;
        default:
                r = -EINVAL;
@@@ -5033,7 -4918,7 +5032,7 @@@ long kvm_arch_vcpu_ioctl(struct file *f
                struct kvm_s390_mem_op mem_op;
  
                if (copy_from_user(&mem_op, argp, sizeof(mem_op)) == 0)
 -                      r = kvm_s390_guest_memsida_op(vcpu, &mem_op);
 +                      r = kvm_s390_vcpu_memsida_op(vcpu, &mem_op);
                else
                        r = -EFAULT;
                break;