Merge tag 'mips_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:
 "Just cleanups and fixes"

* tag 'mips_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup()
  MIPS: Alchemy: Fix an out-of-bound access in db1200_dev_setup()
  MIPS: Fix typos
  MIPS: Remove unused shadow GPR support from vector irq setup
  MIPS: Allow vectored interrupt handler to reside everywhere for 64bit
  mips: Set dump-stack arch description
  mips: mm: add slab availability checking in ioremap_prot
  mips: Optimize max_mapnr init procedure
  mips: Fix max_mapnr being uninitialized on early stages
  mips: Fix incorrect max_low_pfn adjustment
  mips: dmi: Fix early remap on MIPS32
  MIPS: compressed: Use correct instruction for 64 bit code
  MIPS: SGI-IP27: hubio: fix nasid kernel-doc warning
  MAINTAINERS: Add myself as maintainer of the Ralink architecture

diff --combined MAINTAINERS
index 2cd538369f3cfd91ffd01b3748c634796eab5d7a,b3444c8c6512eeba8edc5d0afbb11782929f0f45..f1a3497efb482c526e86eb0639184f41c2542745
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -699,15 -699,6 +699,15 @@@ S:       Maintaine
  F:    Documentation/devicetree/bindings/media/allegro,al5e.yaml
  F:    drivers/media/platform/allegro-dvt/
  
 +ALLIED VISION ALVIUM CAMERA DRIVER
 +M:    Tommaso Merciai <[email protected]>
 +M:    Martin Hecht <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/alliedvision,alvium-csi2.yaml
 +F:    drivers/media/i2c/alvium-csi2.c
 +F:    drivers/media/i2c/alvium-csi2.h
 +
  ALLWINNER A10 CSI DRIVER
  M:    Maxime Ripard <[email protected]>
  L:    [email protected]
@@@ -1693,6 -1684,11 +1693,6 @@@ S:     Odd Fixe
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 -ARM PRIMECELL CLCD PL110 DRIVER
 -M:    Russell King <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/video/fbdev/amba-clcd.*
 -
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <[email protected]>
  S:    Odd Fixes
@@@ -1935,6 -1931,7 +1935,6 @@@ F:      drivers/i2c/busses/i2c-pasemi-platfo
  F:    drivers/iommu/apple-dart.c
  F:    drivers/iommu/io-pgtable-dart.c
  F:    drivers/irqchip/irq-apple-aic.c
 -F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/nvme/host/apple.c
  F:    drivers/nvmem/apple-efuses.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
@@@ -1943,6 -1940,7 +1943,6 @@@ F:      drivers/soc/apple/
  F:    drivers/watchdog/apple_wdt.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
 -F:    include/linux/apple-mailbox.h
  F:    include/linux/soc/apple/*
  
  ARM/ARTPEC MACHINE SUPPORT
@@@ -2019,6 -2017,11 +2019,6 @@@ L:     [email protected]
  S:    Odd Fixes
  N:    clps711x
  
 -ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <[email protected]>
  M:    Alexander Sverdlin <[email protected]>
@@@ -2304,7 -2307,6 +2304,7 @@@ F:      arch/arm/mach-dove
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
 +F:    drivers/bus/mvebu-mbus.c
  F:    drivers/soc/dove/
  
  ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support
@@@ -2319,7 -2321,8 +2319,7 @@@ F:      arch/arm/boot/dts/marvell/armada
  F:    arch/arm/boot/dts/marvell/kirkwood*
  F:    arch/arm/configs/mvebu_*_defconfig
  F:    arch/arm/mach-mvebu/
 -F:    arch/arm64/boot/dts/marvell/armada*
 -F:    arch/arm64/boot/dts/marvell/cn913*
 +F:    arch/arm64/boot/dts/marvell/
  F:    drivers/clk/mvebu/
  F:    drivers/cpufreq/armada-37xx-cpufreq.c
  F:    drivers/cpufreq/armada-8k-cpufreq.c
@@@ -2391,6 -2394,7 +2391,6 @@@ F:      drivers/memory/atmel
  F:    drivers/watchdog/sama5d4_wdt.c
  F:    include/soc/at91/
  X:    drivers/input/touchscreen/atmel_mxt_ts.c
 -X:    drivers/net/wireless/atmel/
  N:    at91
  N:    atmel
  
@@@ -2542,6 -2546,7 +2542,6 @@@ F:      arch/arm64/boot/dts/qcom/sc7280
  F:    arch/arm64/boot/dts/qcom/sdm845-cheza*
  
  ARM/QUALCOMM SUPPORT
 -M:    Andy Gross <[email protected]>
  M:    Bjorn Andersson <[email protected]>
  M:    Konrad Dybcio <[email protected]>
  L:    [email protected]
@@@ -2821,6 -2826,7 +2821,6 @@@ F:      Documentation/devicetree/bindings/in
  F:    Documentation/devicetree/bindings/reset/sunplus,reset.yaml
  F:    arch/arm/boot/dts/sunplus/
  F:    arch/arm/configs/sp7021_*defconfig
 -F:    arch/arm/mach-sunplus/
  F:    drivers/clk/clk-sp7021.c
  F:    drivers/irqchip/irq-sp7021-intc.c
  F:    drivers/reset/reset-sunplus.c
@@@ -2836,6 -2842,11 +2836,6 @@@ F:     arch/arm/boot/dts/synaptics
  F:    arch/arm/mach-berlin/
  F:    arch/arm64/boot/dts/synaptics/
  
 -ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/TEGRA HDMI CEC SUBSYSTEM SUPPORT
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -2852,6 -2863,11 +2852,6 @@@ L:     [email protected]
  S:    Maintained
  F:    arch/arm64/boot/dts/tesla/
  
 -ARM/TETON BGA MACHINE SUPPORT
 -M:    "Mark F. Brown" <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected]
@@@ -2930,6 -2946,7 +2930,6 @@@ F:      Documentation/devicetree/bindings/pi
  F:    Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml
  F:    arch/arm/boot/dts/socionext/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
 -F:    arch/arm/mach-uniphier/
  F:    arch/arm/mm/cache-uniphier.c
  F:    arch/arm64/boot/dts/socionext/uniphier*
  F:    drivers/bus/uniphier-system-bus.c
@@@ -2992,7 -3009,6 +2992,7 @@@ F:      Documentation/devicetree/bindings/i2
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml
 +F:    Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
  F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -3057,14 -3073,6 +3057,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/net/asix,ax88796c.yaml
  F:    drivers/net/ethernet/asix/ax88796c_*
  
 +ASIX PHY DRIVER [RUST]
 +M:    FUJITA Tomonori <[email protected]>
 +R:    Trevor Gross <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/ax88796b_rust.rs
 +
  ASPEED CRYPTO DRIVER
  M:    Neal Liu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3290,6 -3298,13 +3290,6 @@@ T:     git git://github.com/ndyer/linux.gi
  F:    Documentation/devicetree/bindings/input/atmel,maxtouch.yaml
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
  
 -ATMEL WIRELESS DRIVER
 -L:    [email protected]
 -S:    Orphan
 -W:    http://www.thekelleys.org.uk/atmel
 -W:    http://atmelwlandriver.sourceforge.net/
 -F:    drivers/net/wireless/atmel/atmel*
 -
  ATOMIC INFRASTRUCTURE
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -3324,17 -3339,13 +3324,17 @@@ M:   Eric Paris <[email protected]
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linux-audit
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
 +Q:    https://patchwork.kernel.org/project/audit/list
 +B:    mailto:[email protected]
 +P:    https://github.com/linux-audit/audit-kernel/blob/main/README.md
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
  F:    include/asm-generic/audit_*.h
  F:    include/linux/audit.h
  F:    include/linux/audit_arch.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
  F:    lib/*audit.c
 +K:    \baudit_[a-z_0-9]\+\b
  
  AUXILIARY BUS DRIVER
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -3393,16 -3404,6 +3393,16 @@@ W:    https://ez.analog.com/linux-software
  F:    Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml
  F:    drivers/hwmon/axi-fan-control.c
  
 +AXI SPI ENGINE
 +M:    Michael Hennerich <[email protected]>
 +M:    Nuno Sá <[email protected]>
 +R:    David Lechner <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/spi/adi,axi-spi-engine.yaml
 +F:    drivers/spi/spi-axi-spi-engine.c
 +
  AXXIA I2C CONTROLLER
  M:    Krzysztof Adamski <[email protected]>
  L:    [email protected]
@@@ -3455,14 -3456,6 +3455,14 @@@ F:    drivers/video/backlight
  F:    include/linux/backlight.h
  F:    include/linux/pwm_backlight.h
  
 +BAIKAL-T1 PVT HARDWARE MONITOR DRIVER
 +M:    Serge Semin <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
 +F:    Documentation/hwmon/bt1-pvt.rst
 +F:    drivers/hwmon/bt1-pvt.[ch]
 +
  BARCO P50 GPIO DRIVER
  M:    Santosh Kumar Yadav <[email protected]>
  M:    Peter Korsgaard <[email protected]>
@@@ -3495,7 -3488,7 +3495,7 @@@ F:      drivers/net/hamradio/baycom
  
  BCACHE (BLOCK LAYER CACHE)
  M:    Coly Li <[email protected]>
 -M:    Kent Overstreet <kent.overstreet@gmail.com>
 +M:    Kent Overstreet <kent.overstreet@linux.dev>
  L:    [email protected]
  S:    Maintained
  W:    http://bcache.evilpiepirate.org
@@@ -4134,6 -4127,7 +4134,6 @@@ M:      Franky Lin <[email protected]
  M:    Hante Meuleman <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
@@@ -5164,7 -5158,7 +5164,7 @@@ M:      Philipp Zabel <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/coda.yaml
 -F:    drivers/media/platform/chips-media/
 +F:    drivers/media/platform/chips-media/coda
  
  CODE OF CONDUCT
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -5268,10 -5262,10 +5268,10 @@@ W:   http://accessrunner.sourceforge.net
  F:    drivers/usb/atm/cxacru.c
  
  CONFIDENTIAL COMPUTING THREAT MODEL FOR X86 VIRTUALIZATION (SNP/TDX)
 -M:    Elena Reshetova <[email protected]>
 -M:    Carlos Bilbao <[email protected]>
 -S:    Maintained
 -F:    Documentation/security/snp-tdx-threat-model.rst
 +M:    Elena Reshetova <[email protected]>
 +M:    Carlos Bilbao <[email protected]>
 +S:    Maintained
 +F:    Documentation/security/snp-tdx-threat-model.rst
  
  CONFIGFS
  M:    Joel Becker <[email protected]>
@@@ -5346,7 -5340,6 +5346,7 @@@ L:      [email protected]
  S:    Maintained
  F:    mm/memcontrol.c
  F:    mm/swap_cgroup.c
 +F:    samples/cgroup/*
  F:    tools/testing/selftests/cgroup/memcg_protection.m
  F:    tools/testing/selftests/cgroup/test_hugetlb_memcg.c
  F:    tools/testing/selftests/cgroup/test_kmem.c
@@@ -5531,12 -5524,6 +5531,12 @@@ F:    include/crypto
  F:    include/linux/crypto*
  F:    lib/crypto/
  
 +CRYPTO SPEED TEST COMPARE
 +M:    Wang Jinchao <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    tools/crypto/tcrypt/tcrypt_speed_compare.py
 +
  CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
  M:    Neil Horman <[email protected]>
  L:    [email protected]
@@@ -5896,7 -5883,7 +5896,7 @@@ DELL SYSTEMS MANAGEMENT BASE DRIVER (dc
  M:    Stuart Hayes <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/driver-api/dcdbas.rst
 +F:    Documentation/userspace-api/dcdbas.rst
  F:    drivers/platform/x86/dell/dcdbas.*
  
  DELL WMI DDV DRIVER
@@@ -6063,8 -6050,10 +6063,8 @@@ M:     Mikulas Patocka <[email protected]
  M:    [email protected]
  L:    [email protected]
  S:    Maintained
 -W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
 -T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  F:    Documentation/admin-guide/device-mapper/
  F:    drivers/md/Kconfig
  F:    drivers/md/Makefile
@@@ -6110,7 -6099,7 +6110,7 @@@ F:      Documentation/devicetree/bindings/re
  F:    Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
 -F:    Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
 +F:    Documentation/devicetree/bindings/watchdog/dlg,da90??-watchdog.yaml
  F:    Documentation/hwmon/da90??.rst
  F:    drivers/gpio/gpio-da90??.c
  F:    drivers/hwmon/da90??-hwmon.c
@@@ -6496,7 -6485,8 +6496,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/sun4i/sun8i*
  
  DRM DRIVER FOR ARM PL111 CLCD
 -M:    Emma Anholt <[email protected]>
 -S:    Supported
 +S:    Orphan
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/pl111/
  
@@@ -6611,7 -6601,8 +6611,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/panel/panel-himax-hx8394.c
  
  DRM DRIVER FOR HX8357D PANELS
 -M:    Emma Anholt <[email protected]>
 -S:    Maintained
 +S:    Orphan
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/himax,hx8357d.txt
  F:    drivers/gpu/drm/tiny/hx8357d.c
@@@ -6638,12 -6629,6 +6638,12 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
  F:    drivers/gpu/drm/tiny/ili9486.c
  
 +DRM DRIVER FOR ILITEK ILI9805 PANELS
 +M:    Michael Trimarchi <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/ilitek,ili9805.yaml
 +F:    drivers/gpu/drm/panel/panel-ilitek-ili9805.c
 +
  DRM DRIVER FOR JADARD JD9365DA-H3 MIPI-DSI LCD PANELS
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -6872,12 -6857,6 +6872,12 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/ste,mcde.yaml
  F:    drivers/gpu/drm/mcde/
  
 +DRM DRIVER FOR SYNAPTICS R63353 PANELS
 +M:    Michael Trimarchi <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/synaptics,r63353.yaml
 +F:    drivers/gpu/drm/panel/panel-synaptics-r63353.c
 +
  DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -6925,8 -6904,8 +6925,8 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/vboxvideo/
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
 -M:    Zack Rusin <zackr@vmware.com>
 -R:    VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>
 +M:    Zack Rusin <zack.rusin@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7162,7 -7141,6 +7162,7 @@@ F:      include/linux/platform_data/shmob_dr
  DRM DRIVERS FOR ROCKCHIP
  M:    Sandy Huang <[email protected]>
  M:    Heiko Stübner <[email protected]>
 +M:    Andy Yan <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7217,8 -7195,8 +7217,8 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/omapdrm/
  
  DRM DRIVERS FOR V3D
 -M:    Emma Anholt <[email protected]>
  M:    Melissa Wen <[email protected]>
 +M:    Maíra Canal <[email protected]>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
@@@ -7226,6 -7204,7 +7226,6 @@@ F:      drivers/gpu/drm/v3d
  F:    include/uapi/drm/v3d_drm.h
  
  DRM DRIVERS FOR VC4
 -M:    Emma Anholt <[email protected]>
  M:    Maxime Ripard <[email protected]>
  S:    Supported
  T:    git git://github.com/anholt/linux
@@@ -7902,14 -7881,6 +7902,14 @@@ F:    include/uapi/linux/mdio.
  F:    include/uapi/linux/mii.h
  F:    net/core/of_net.c
  
 +ETHERNET PHY LIBRARY [RUST]
 +M:    FUJITA Tomonori <[email protected]>
 +R:    Trevor Gross <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    rust/kernel/net/phy.rs
 +
  EXEC & BINFMT API
  R:    Eric Biederman <[email protected]>
  R:    Kees Cook <[email protected]>
@@@ -7957,7 -7928,6 +7957,7 @@@ F:      include/uapi/linux/ext4.
  
  Extended Verification Module (EVM)
  M:    Mimi Zohar <[email protected]>
 +M:    Roberto Sassu <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@@ -8136,7 -8106,6 +8136,7 @@@ F:      include/trace/events/fs_dax.
  FILESYSTEMS (VFS and infrastructure)
  M:    Alexander Viro <[email protected]>
  M:    Christian Brauner <[email protected]>
 +R:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    fs/*
@@@ -8157,16 -8126,6 +8157,16 @@@ F:    fs/exportfs
  F:    fs/fhandle.c
  F:    include/linux/exportfs.h
  
 +FILESYSTEMS [IDMAPPED MOUNTS]
 +M:    Christian Brauner <[email protected]>
 +M:    Seth Forshee <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/filesystems/idmappings.rst
 +F:    fs/mnt_idmapping.c
 +F:    include/linux/mnt_idmapping.*
 +F:    tools/testing/selftests/mount_setattr/
 +
  FILESYSTEMS [IOMAP]
  M:    Christian Brauner <[email protected]>
  R:    Darrick J. Wong <[email protected]>
@@@ -8176,15 -8135,6 +8176,15 @@@ S:    Supporte
  F:    fs/iomap/
  F:    include/linux/iomap.h
  
 +FILESYSTEMS [STACKABLE]
 +M:    Miklos Szeredi <[email protected]>
 +M:    Amir Goldstein <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    fs/backing-file.c
 +F:    include/linux/backing-file.h
 +
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <[email protected]>
  L:    [email protected]
@@@ -8271,14 -8221,11 +8271,14 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/input/joystick/fsia6b.c
  
 -FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER
 +FOCUSRITE SCARLETT2 MIXER DRIVER (Scarlett Gen 2+ and Clarett)
  M:    Geoffrey D. Bennett <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 +W:    https://github.com/geoffreybennett/scarlett-gen2
 +B:    https://github.com/geoffreybennett/scarlett-gen2/issues
 +T:    git https://github.com/geoffreybennett/scarlett-gen2.git
 +F:    include/uapi/sound/scarlett2.h
  F:    sound/usb/mixer_scarlett2.c
  
  FORCEDETH GIGABIT ETHERNET DRIVER
@@@ -8583,6 -8530,7 +8583,6 @@@ L:      [email protected]
  S:    Maintained
  F:    sound/soc/fsl/fsl*
  F:    sound/soc/fsl/imx*
 -F:    sound/soc/fsl/mpc8610_hpcd.c
  
  FREESCALE SOC SOUND QMC DRIVER
  M:    Herve Codina <[email protected]>
@@@ -8761,21 -8709,6 +8761,21 @@@ F:    kernel/futex/
  F:    tools/perf/bench/futex*
  F:    tools/testing/selftests/futex/
  
 +GALAXYCORE GC0308 CAMERA SENSOR DRIVER
 +M:    Sebastian Reichel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/galaxycore,gc0308.yaml
 +F:    drivers/media/i2c/gc0308.c
 +
 +GALAXYCORE GC2145 SENSOR DRIVER
 +M:    Alain Volmat <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/galaxycore,gc2145.yaml
 +F:    drivers/media/i2c/gc2145.c
 +
  GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
  M:    Tim Harvey <[email protected]>
  S:    Maintained
@@@ -8894,13 -8827,21 +8894,13 @@@ F:   Documentation/devicetree/bindings/i2
  F:    drivers/i2c/muxes/i2c-demux-pinctrl.c
  
  GENERIC PM DOMAINS
 -M:    "Rafael J. Wysocki" <[email protected]>
 -M:    Kevin Hilman <[email protected]>
  M:    Ulf Hansson <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/power/power?domain*
 -F:    drivers/base/power/domain*.c
 -F:    include/linux/pm_domain.h
 -
 -GENERIC PM DOMAIN PROVIDERS
 -M:    Ulf Hansson <[email protected]>
 -L:    [email protected]
 -S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
  F:    drivers/pmdomain/
 +F:    include/linux/pm_domain.h
  
  GENERIC RADIX TREE
  M:    Kent Overstreet <[email protected]>
@@@ -8967,13 -8908,6 +8967,13 @@@ F:    Documentation/filesystems/gfs2
  F:    fs/gfs2/
  F:    include/uapi/linux/gfs2_ondisk.h
  
 +GIGABYTE WATERFORCE SENSOR DRIVER
 +M:    Aleksa Savic <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/gigabyte_waterforce.rst
 +F:    drivers/hwmon/gigabyte_waterforce.c
 +
  GIGABYTE WMI DRIVER
  M:    Thomas Weißschuh <[email protected]>
  L:    [email protected]
@@@ -9020,16 -8954,6 +9020,16 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
  F:    drivers/firmware/google/
  
 +GOOGLE TENSOR SoC SUPPORT
 +M:    Peter Griffin <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/google,gs101-clock.yaml
 +F:    arch/arm64/boot/dts/exynos/google/
 +F:    drivers/clk/samsung/clk-gs101.c
 +F:    include/dt-bindings/clock/google,gs101.h
 +
  GPD POCKET FAN DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
@@@ -9069,7 -8993,7 +9069,7 @@@ F:      drivers/gpio/gpio-mockup.
  F:    tools/testing/selftests/gpio/
  
  GPIO REGMAP
 -M:    Michael Walle <m[email protected]>
 +M:    Michael Walle <m[email protected]>
  S:    Maintained
  F:    drivers/gpio/gpio-regmap.c
  F:    include/linux/gpio/regmap.h
@@@ -9078,9 -9002,12 +9078,9 @@@ K:     (devm_)?gpio_regmap_(un)?registe
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Bartosz Golaszewski <[email protected]>
 -R:    Andy Shevchenko <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 -F:    Documentation/ABI/obsolete/sysfs-gpio
 -F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/admin-guide/gpio/
  F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/driver-api/gpio/
@@@ -9089,16 -9016,6 +9089,16 @@@ F:    include/dt-bindings/gpio
  F:    include/linux/gpio.h
  F:    include/linux/gpio/
  F:    include/linux/of_gpio.h
 +
 +GPIO UAPI
 +M:    Bartosz Golaszewski <[email protected]>
 +R:    Kent Gibson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 +F:    Documentation/ABI/obsolete/sysfs-gpio
 +F:    Documentation/ABI/testing/gpio-cdev
 +F:    drivers/gpio/gpiolib-cdev.c
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
@@@ -9341,6 -9258,7 +9341,6 @@@ F:      drivers/char/hw_random
  F:    include/linux/hw_random.h
  
  HARDWARE SPINLOCK CORE
 -M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
  R:    Baolin Wang <[email protected]>
  L:    [email protected]
@@@ -9569,7 -9487,6 +9569,7 @@@ F:      Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-hisi.c
  
  HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 +M:    Zhiqi Song <[email protected]>
  M:    Longfang Liu <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -9609,7 -9526,6 +9609,7 @@@ F:      drivers/bus/hisi_lpc.
  HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
  M:    Yisen Zhuang <[email protected]>
  M:    Salil Mehta <[email protected]>
 +M:    Jijie Shao <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.hisilicon.com
@@@ -9672,6 -9588,7 +9672,6 @@@ F:      Documentation/devicetree/bindings/sc
  F:    drivers/scsi/hisi_sas/
  
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 -M:    Kai Ye <[email protected]>
  M:    Longfang Liu <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -9738,6 -9655,11 +9738,6 @@@ S:     Maintaine
  F:    Documentation/devicetree/bindings/iio/pressure/honeywell,mprls0025pa.yaml
  F:    drivers/iio/pressure/mprls0025pa.c
  
 -HOST AP DRIVER
 -L:    [email protected]
 -S:    Obsolete
 -F:    drivers/net/wireless/intersil/hostap/
 -
  HP BIOSCFG DRIVER
  M:    Jorge Lopez <[email protected]>
  L:    [email protected]
@@@ -9840,6 -9762,7 +9840,6 @@@ F:      Documentation/networking/device_driv
  F:    drivers/net/ethernet/huawei/hinic/
  
  HUGETLB SUBSYSTEM
 -M:    Mike Kravetz <[email protected]>
  M:    Muchun Song <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -9863,8 -9786,8 +9863,8 @@@ T:      git git://linuxtv.org/media_tree.gi
  F:    drivers/media/platform/st/sti/hva
  
  HWPOISON MEMORY FAILURE HANDLING
 -M:    Naoya Horiguchi <naoya.horiguchi@nec.com>
 -R:    Miaohe Lin <linmiaohe@huawei.com>
 +M:    Miaohe Lin <linmiaohe@huawei.com>
 +R:    Naoya Horiguchi <naoya.horiguchi@nec.com>
  L:    [email protected]
  S:    Maintained
  F:    mm/hwpoison-inject.c
@@@ -10275,6 -10198,16 +10275,6 @@@ S:  Maintaine
  W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
 -IDMAPPED MOUNTS
 -M:    Christian Brauner <[email protected]>
 -M:    Seth Forshee <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git
 -F:    Documentation/filesystems/idmappings.rst
 -F:    include/linux/mnt_idmapping.*
 -F:    tools/testing/selftests/mount_setattr/
 -
  IDT VersaClock 5 CLOCK DRIVER
  M:    Luca Ceresoli <[email protected]>
  S:    Maintained
@@@ -10408,17 -10341,6 +10408,17 @@@ IMGTEC IR DECODER DRIVE
  S:    Orphan
  F:    drivers/media/rc/img-ir/
  
 +IMGTEC POWERVR DRM DRIVER
 +M:    Frank Binns <[email protected]>
 +M:    Donald Robson <[email protected]>
 +M:    Matt Coster <[email protected]>
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/gpu/img,powervr.yaml
 +F:    Documentation/gpu/imagination/
 +F:    drivers/gpu/drm/imagination/
 +F:    include/uapi/drm/pvr_drm.h
 +
  IMON SOUNDGRAPH USB IR RECEIVER
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -10578,9 -10500,7 +10578,9 @@@ F:   drivers/crypto/inside-secure
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  M:    Mimi Zohar <[email protected]>
 +M:    Roberto Sassu <[email protected]>
  M:    Dmitry Kasatkin <[email protected]>
 +R:    Eric Snowberg <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@@ -10658,26 -10578,16 +10658,26 @@@ L:        [email protected]
  S:    Supported
  F:    arch/x86/include/asm/intel-family.h
  
 -INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 +INTEL DRM DISPLAY FOR XE AND I915 DRIVERS
 +M:    Jani Nikula <[email protected]>
 +M:    Rodrigo Vivi <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpu/drm/i915/display/
 +F:    drivers/gpu/drm/xe/display/
 +F:    drivers/gpu/drm/xe/compat-i915-headers
 +
 +INTEL DRM I915 DRIVER (Meteor Lake, DG2 and older excluding Poulsbo, Moorestown and derivative)
  M:    Jani Nikula <[email protected]>
  M:    Joonas Lahtinen <[email protected]>
  M:    Rodrigo Vivi <[email protected]>
  M:    Tvrtko Ursulin <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linuxgraphics/
 +W:    https://drm.pages.freedesktop.org/intel-docs/
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
 -B:    https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs
 +B:    https://drm.pages.freedesktop.org/intel-docs/how-to-file-i915-bugs.html
  C:    irc://irc.oftc.net/intel-gfx
  T:    git git://anongit.freedesktop.org/drm-intel
  F:    Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
@@@ -10687,23 -10597,6 +10687,23 @@@ F: drivers/gpu/drm/i915
  F:    include/drm/i915*
  F:    include/uapi/drm/i915_drm.h
  
 +INTEL DRM XE DRIVER (Lunar Lake and newer)
 +M:    Lucas De Marchi <[email protected]>
 +M:    Oded Gabbay <[email protected]>
 +M:    Thomas Hellström <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://drm.pages.freedesktop.org/intel-docs/
 +Q:    http://patchwork.freedesktop.org/project/intel-xe/
 +B:    https://gitlab.freedesktop.org/drm/xe/kernel/-/issues
 +C:    irc://irc.oftc.net/xe
 +T:    git https://gitlab.freedesktop.org/drm/xe/kernel.git
 +F:    Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon
 +F:    Documentation/gpu/xe/
 +F:    drivers/gpu/drm/xe/
 +F:    include/drm/xe*
 +F:    include/uapi/drm/xe_drm.h
 +
  INTEL ETHERNET DRIVERS
  M:    Jesse Brandeburg <[email protected]>
  M:    Tony Nguyen <[email protected]>
@@@ -10727,6 -10620,13 +10727,6 @@@ S:  Supporte
  F:    drivers/infiniband/hw/irdma/
  F:    include/uapi/rdma/irdma-abi.h
  
 -INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -M:    Maik Broemme <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/fb/intelfb.rst
 -F:    drivers/video/fbdev/intelfb/
 -
  INTEL GPIO DRIVERS
  M:    Andy Shevchenko <[email protected]>
  L:    [email protected]
@@@ -10740,7 -10640,6 +10740,7 @@@ F:   drivers/gpio/gpio-pch.
  F:    drivers/gpio/gpio-sch.c
  F:    drivers/gpio/gpio-sodaville.c
  F:    drivers/gpio/gpio-tangier.c
 +F:    drivers/gpio/gpio-tangier.h
  
  INTEL GVT-g DRIVERS (Intel GPU Virtualization)
  M:    Zhenyu Wang <[email protected]>
@@@ -10766,13 -10665,6 +10766,13 @@@ S: Supporte
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  F:    drivers/dma/ioat*
  
 +INTEL IAA CRYPTO DRIVER
 +M:    Tom Zanussi <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/driver-api/crypto/iaa/iaa-crypto.rst
 +F:    drivers/crypto/intel/iaa/*
 +
  INTEL IDLE DRIVER
  M:    Jacob Pan <[email protected]>
  M:    Len Brown <[email protected]>
@@@ -11071,7 -10963,6 +11071,7 @@@ F:   drivers/net/wireless/intel/iwlegacy
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Gregory Greenman <[email protected]>
 +M:    Miri Korenblit <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@@ -11211,7 -11102,6 +11211,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.dk/linux-block
  T:    git git://git.kernel.dk/liburing
 +F:    include/linux/io_uring/
  F:    include/linux/io_uring.h
  F:    include/linux/io_uring_types.h
  F:    include/trace/events/io_uring.h
@@@ -11307,7 -11197,7 +11307,7 @@@ F:   drivers/media/radio/radio-isa
  ISAPNP
  M:    Jaroslav Kysela <[email protected]>
  S:    Maintained
 -F:    Documentation/driver-api/isapnp.rst
 +F:    Documentation/userspace-api/isapnp.rst
  F:    drivers/pnp/isapnp/
  F:    include/linux/isapnp.h
  
@@@ -11580,7 -11470,6 +11580,7 @@@ F:   scripts/*vmlinux
  F:    scripts/Kbuild*
  F:    scripts/Makefile*
  F:    scripts/basic/
 +F:    scripts/clang-tools/
  F:    scripts/dummy-tools/
  F:    scripts/mk*
  F:    scripts/mod/
@@@ -12080,14 -11969,6 +12080,14 @@@ S: Maintaine
  F:    arch/mips/lantiq
  F:    drivers/soc/lantiq
  
 +LANTIQ PEF2256 DRIVER
 +M:    Herve Codina <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/lantiq,pef2256.yaml
 +F:    drivers/net/wan/framer/pef2256/
 +F:    drivers/pinctrl/pinctrl-pef2256.c
 +F:    include/linux/framer/pef2256.h
 +
  LASI 53c700 driver for PARISC
  M:    "James E.J. Bottomley" <[email protected]>
  L:    [email protected]
@@@ -12215,10 -12096,9 +12215,10 @@@ F: drivers/ata/sata_promise.
  
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
  M:    Damien Le Moal <[email protected]>
 +M:    Niklas Cassel <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux.git
  F:    Documentation/ABI/testing/sysfs-ata
  F:    Documentation/devicetree/bindings/ata/
  F:    drivers/ata/
@@@ -12309,8 -12189,6 +12309,8 @@@ LINUX FOR POWERPC (32-BIT AND 64-BIT
  M:    Michael Ellerman <[email protected]>
  R:    Nicholas Piggin <[email protected]>
  R:    Christophe Leroy <[email protected]>
 +R:    Aneesh Kumar K.V <[email protected]>
 +R:    Naveen N. Rao <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linuxppc/wiki/wiki
@@@ -12356,21 -12234,21 +12356,21 @@@ S:        Orpha
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
  
 -LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 +LINUX FOR POWERPC EMBEDDED PPC85XX
  M:    Scott Wood <[email protected]>
  L:    [email protected]
  S:    Odd fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
  F:    Documentation/devicetree/bindings/cache/freescale-l2cache.txt
  F:    Documentation/devicetree/bindings/powerpc/fsl/
 -F:    arch/powerpc/platforms/83xx/
  F:    arch/powerpc/platforms/85xx/
  
 -LINUX FOR POWERPC EMBEDDED PPC8XX
 +LINUX FOR POWERPC EMBEDDED PPC8XX AND PPC83XX
  M:    Christophe Leroy <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/platforms/8xx/
 +F:    arch/powerpc/platforms/83xx/
  
  LINUX KERNEL DUMP TEST MODULE (LKDTM)
  M:    Kees Cook <[email protected]>
@@@ -12517,12 -12395,6 +12517,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/admin-guide/LSM/LoadPin.rst
  F:    security/loadpin/
  
 +LOCKDOWN SECURITY MODULE
 +L:    [email protected]
 +S:    Odd Fixes
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
 +F:    security/lockdown/
 +
  LOCKING PRIMITIVES
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
@@@ -12534,7 -12406,7 +12534,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  F:    Documentation/locking/
  F:    arch/*/include/asm/spinlock*.h
 -F:    include/linux/lockdep.h
 +F:    include/linux/lockdep*.h
  F:    include/linux/mutex*.h
  F:    include/linux/rwlock*.h
  F:    include/linux/rwsem*.h
@@@ -12705,16 -12577,6 +12705,16 @@@ S: Maintaine
  F:    Documentation/hwmon/ltc4261.rst
  F:    drivers/hwmon/ltc4261.c
  
 +LTC4286 HARDWARE MONITOR DRIVER
 +M:    Delphine CC Chiu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/lltc,ltc4286.yaml
 +F:    Documentation/hwmon/ltc4286.rst
 +F:    drivers/hwmon/pmbus/Kconfig
 +F:    drivers/hwmon/pmbus/Makefile
 +F:    drivers/hwmon/pmbus/ltc4286.c
 +
  LTC4306 I2C MULTIPLEXER DRIVER
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
@@@ -12724,11 -12586,12 +12724,11 @@@ F:        Documentation/devicetree/bindings/i2
  F:    drivers/i2c/muxes/i2c-mux-ltc4306.c
  
  LTP (Linux Test Project)
 -M:    Mike Frysinger <[email protected]>
  M:    Cyril Hrubis <[email protected]>
 -M:    Wanlong Gao <[email protected]>
  M:    Jan Stancek <[email protected]>
 -M:    Stanislav Kholmanskikh <[email protected]>
 -M:    Alexey Kodanev <[email protected]>
 +M:    Petr Vorel <[email protected]>
 +M:    Li Wang <[email protected]>
 +M:    Yang Xu <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
  W:    http://linux-test-project.github.io/
@@@ -12828,7 -12691,7 +12828,7 @@@ F:   drivers/mailbox/arm_mhuv2.
  F:    include/linux/mailbox/arm_mhuv2_message.h
  
  MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 -M:    Michael Kerrisk <[email protected]>
 +M:    Alejandro Colomar <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.kernel.org/doc/man-pages
@@@ -12868,8 -12731,7 +12868,8 @@@ MARVELL 88E6XXX ETHERNET SWITCH FABRIC 
  M:    Andrew Lunn <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
 +F:    Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml
 +F:    Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml
  F:    Documentation/networking/devlink/mv88e6xxx.rst
  F:    drivers/net/dsa/mv88e6xxx/
  F:    include/linux/dsa/mv88e6xxx.h
@@@ -12952,7 -12814,7 +12952,7 @@@ S:   Maintaine
  F:    drivers/net/ethernet/marvell/mvneta.*
  
  MARVELL MVPP2 ETHERNET DRIVER
 -M:    Marcin Wojtas <mw@semihalf.com>
 +M:    Marcin Wojtas <marcin.s.wojtas@gmail.com>
  M:    Russell King <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -13098,7 -12960,6 +13098,7 @@@ MAX96712 QUAD GMSL2 DESERIALIZER DRIVE
  M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/maxim,max96712.yaml
  F:    drivers/staging/media/max96712/max96712.c
  
  MAX9860 MONO AUDIO VOICE CODEC DRIVER
@@@ -13519,16 -13380,13 +13519,16 @@@ W:        https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/dvb-frontends/stv6111*
  
 -MEDIA DRIVERS FOR STM32 - DCMI
 +MEDIA DRIVERS FOR STM32 - DCMI / DCMIPP
  M:    Hugues Fruchet <[email protected]>
 +M:    Alain Volmat <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
 +F:    Documentation/devicetree/bindings/media/st,stm32-dcmipp.yaml
  F:    drivers/media/platform/st/stm32/stm32-dcmi.c
 +F:    drivers/media/platform/st/stm32/stm32-dcmipp/*
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -15075,7 -14933,6 +15075,7 @@@ Q:   https://patchwork.kernel.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
  F:    Documentation/devicetree/bindings/net/
 +F:    Documentation/networking/net_cachelines/net_device.rst
  F:    drivers/connector/
  F:    drivers/net/
  F:    include/dt-bindings/net/
@@@ -15131,7 -14988,6 +15131,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/core-api/netlink.rst
  F:    Documentation/netlink/
  F:    Documentation/networking/
 +F:    Documentation/networking/net_cachelines/
  F:    Documentation/process/maintainer-netdev.rst
  F:    Documentation/userspace-api/netlink/
  F:    include/linux/in.h
@@@ -15221,7 -15077,6 +15221,7 @@@ K:   \bmdo
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <[email protected]>
  M:    Mat Martineau <[email protected]>
 +R:    Geliang Tang <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -15229,7 -15084,7 +15229,7 @@@ W:   https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
 -F:    Documentation/netlink/specs/mptcp.yaml
 +F:    Documentation/netlink/specs/mptcp_pm.yaml
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
@@@ -15242,7 -15097,6 +15242,7 @@@ NETWORKING [TCP
  M:    Eric Dumazet <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/networking/net_cachelines/tcp_sock.rst
  F:    include/linux/tcp.h
  F:    include/net/tcp.h
  F:    include/trace/events/tcp.h
@@@ -15570,10 -15424,10 +15570,10 @@@ F:        Documentation/devicetree/bindings/ne
  F:    drivers/bluetooth/btnxpuart.c
  
  NXP C45 TJA11XX PHY DRIVER
 -M:    Radu Pirea <radu-nicolae.pire[email protected]>
 +M:    Andrei Botila <andrei.botil[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/phy/nxp-c45-tja11xx.c
 +F:    drivers/net/phy/nxp-c45-tja11xx*
  
  NXP FSPI DRIVER
  M:    Han Xu <[email protected]>
@@@ -15841,8 -15695,9 +15841,8 @@@ F:   Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-omap.c
  
  OMAP HARDWARE SPINLOCK SUPPORT
 -M:    Ohad Ben-Cohen <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/hwspinlock/omap_hwspinlock.c
  
  OMAP HS MMC SUPPORT
@@@ -15942,7 -15797,6 +15942,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/arm/ti/omap.yaml
  F:    arch/arm/configs/omap2plus_defconfig
  F:    arch/arm/mach-omap2/
 +F:    drivers/bus/omap*.[ch]
  F:    drivers/bus/ti-sysc.c
  F:    drivers/gpio/gpio-tps65219.c
  F:    drivers/i2c/busses/i2c-omap.c
@@@ -16105,14 -15959,6 +16105,14 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov5695.c
  
 +OMNIVISION OV64A40 SENSOR DRIVER
 +M:    Jacopo Mondi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov64a40.yaml
 +F:    drivers/media/i2c/ov64a40.c
 +
  OMNIVISION OV7670 SENSOR DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -16282,7 -16128,7 +16282,7 @@@ F:   include/dt-bindings
  
  OPENCOMPUTE PTP CLOCK DRIVER
  M:    Jonathan Lemon <[email protected]>
 -M:    Vadim Fedorenko <vadfed@fb.com>
 +M:    Vadim Fedorenko <vadfed@linux.dev>
  L:    [email protected]
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
@@@ -16360,6 -16206,13 +16360,6 @@@ T:  git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/orangefs.rst
  F:    fs/orangefs/
  
 -ORINOCO DRIVER
 -L:    [email protected]
 -S:    Orphan
 -W:    https://wireless.wiki.kernel.org/en/users/Drivers/orinoco
 -W:    http://www.nongnu.org/orinoco/
 -F:    drivers/net/wireless/intersil/orinoco/
 -
  OV2659 OMNIVISION SENSOR DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -16595,10 -16448,11 +16595,10 @@@ F:        Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/pcie-armada8k.c
  
  PCI DRIVER FOR CADENCE PCIE IP
 -M:    Tom Joseph <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/devicetree/bindings/pci/cdns,*
 -F:    drivers/pci/controller/cadence/
 +F:    drivers/pci/controller/cadence/*cadence*
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <[email protected]>
@@@ -17505,7 -17359,7 +17505,7 @@@ F:   tools/testing/selftests/proc
  PROC SYSCTL
  M:    Luis Chamberlain <[email protected]>
  M:    Kees Cook <[email protected]>
 -M:    Iurii Zaikin <yzaikin@google.com>
 +M:    Joel Granados <j.granados@samsung.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17644,11 -17498,12 +17644,11 @@@ F:        Documentation/devicetree/bindings/le
  F:    drivers/media/rc/pwm-ir-tx.c
  
  PWM SUBSYSTEM
 -M:    Thierry Reding <[email protected]>
 -R:    Uwe Kleine-König <[email protected]>
 +M:    Uwe Kleine-König <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.ozlabs.org/project/linux-pwm/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git
  F:    Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml
  F:    Documentation/devicetree/bindings/pwm/
  F:    Documentation/driver-api/pwm.rst
@@@ -17658,7 -17513,7 +17658,7 @@@ F:   drivers/video/backlight/pwm_bl.
  F:    include/dt-bindings/pwm/
  F:    include/linux/pwm.h
  F:    include/linux/pwm_backlight.h
 -K:    pwm_(config|apply_state|ops)
 +K:    pwm_(config|apply_might_sleep|apply_atomic|ops)
  
  PXA GPIO DRIVER
  M:    Robert Jarzmik <[email protected]>
@@@ -18196,6 -18051,7 +18196,7 @@@ F:   drivers/media/cec/usb/rainshadow
  
  RALINK MIPS ARCHITECTURE
  M:    John Crispin <[email protected]>
+ M:    Sergio Paracuellos <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/mips/ralink
@@@ -18250,6 -18106,11 +18251,6 @@@ F:  drivers/ras
  F:    include/linux/ras.h
  F:    include/ras/ras_event.h
  
 -RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/net/wireless/legacy/ray*
 -
  RC-CORE / LIRC FRAMEWORK
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -18717,7 -18578,6 +18718,7 @@@ F:   Documentation/devicetree/bindings/us
  F:    arch/riscv/boot/dts/microchip/
  F:    drivers/char/hw_random/mpfs-rng.c
  F:    drivers/clk/microchip/clk-mpfs*.c
 +F:    drivers/firmware/microchip/mpfs-auto-update.c
  F:    drivers/i2c/busses/i2c-microchip-corei2c.c
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/pci/controller/pcie-microchip-host.c
@@@ -19575,29 -19435,22 +19576,29 @@@ SECURITY SUBSYSTE
  M:    Paul Moore <[email protected]>
  M:    James Morris <[email protected]>
  M:    "Serge E. Hallyn" <[email protected]>
 -L:    [email protected] (suggested Cc:)
 +L:    [email protected]
  S:    Supported
 -W:    http://kernsec.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
 +Q:    https://patchwork.kernel.org/project/linux-security-module/list
 +B:    mailto:[email protected]
 +P:    https://github.com/LinuxSecurityModule/kernel/blob/main/README.md
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
 +F:    include/uapi/linux/lsm.h
  F:    security/
 +F:    tools/testing/selftests/lsm/
  X:    security/selinux/
 +K:    \bsecurity_[a-z_0-9]\+\b
  
  SELINUX SECURITY MODULE
  M:    Paul Moore <[email protected]>
  M:    Stephen Smalley <[email protected]>
 -M:    Eric Paris <[email protected]>
 +R:    Ondrej Mosnacek <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://selinuxproject.org
  W:    https://github.com/SELinuxProject
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
 +Q:    https://patchwork.kernel.org/project/selinux/list
 +B:    mailto:[email protected]
 +P:    https://github.com/SELinuxProject/selinux-kernel/blob/main/README.md
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
  F:    Documentation/ABI/removed/sysfs-selinux-checkreqprot
  F:    Documentation/ABI/removed/sysfs-selinux-disable
  F:    Documentation/admin-guide/LSM/SELinux.rst
@@@ -19712,6 -19565,7 +19713,6 @@@ S:   Maintaine
  F:    drivers/misc/sgi-xp/
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 -M:    Karsten Graul <[email protected]>
  M:    Wenjia Zhang <[email protected]>
  M:    Jan Karcher <[email protected]>
  R:    D. Wythe <[email protected]>
@@@ -19737,19 -19591,6 +19738,19 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/rj54n1cb0c.c
  F:    include/media/i2c/rj54n1cb0c.h
  
 +SHRINKER
 +M:    Andrew Morton <[email protected]>
 +M:    Dave Chinner <[email protected]>
 +R:    Qi Zheng <[email protected]>
 +R:    Roman Gushchin <[email protected]>
 +R:    Muchun Song <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/admin-guide/mm/shrinker_debugfs.rst
 +F:    include/linux/shrinker.h
 +F:    mm/shrinker.c
 +F:    mm/shrinker_debug.c
 +
  SH_VOU V4L2 OUTPUT DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -19866,13 -19707,6 +19867,13 @@@ S: Supporte
  N:    sifive
  K:    [^@]sifive
  
 +SIFIVE CACHE DRIVER
 +M:    Conor Dooley <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
 +F:    drivers/cache/sifive_ccache.c
 +
  SIFIVE FU540 SYSTEM-ON-CHIP
  M:    Paul Walmsley <[email protected]>
  M:    Palmer Dabbelt <[email protected]>
@@@ -19888,6 -19722,13 +19889,6 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
  F:    drivers/dma/sf-pdma/
  
 -SIFIVE SOC DRIVERS
 -M:    Conor Dooley <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 -F:    Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
 -F:    drivers/soc/sifive/
  
  SILEAD TOUCHSCREEN DRIVER
  M:    Hans de Goede <[email protected]>
@@@ -19928,6 -19769,11 +19929,6 @@@ F:  Documentation/devicetree/bindings/di
  F:    drivers/video/fbdev/simplefb.c
  F:    include/linux/platform_data/simplefb.h
  
 -SIMTEC EB110ATX (Chalice CATS)
 -M:    Simtec Linux Team <[email protected]>
 -S:    Supported
 -W:    http://www.simtec.co.uk/products/EB110ATX/
 -
  SIOX
  M:    Thorsten Scherer <[email protected]>
  M:    Uwe Kleine-König <[email protected]>
@@@ -19977,7 -19823,7 +19978,7 @@@ W:   http://www.winischhofer.at/linuxsisu
  F:    drivers/usb/misc/sisusbvga/
  
  SL28 CPLD MFD DRIVER
 -M:    Michael Walle <m[email protected]>
 +M:    Michael Walle <m[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
  F:    Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
@@@ -19992,7 -19838,7 +19993,7 @@@ F:   drivers/pwm/pwm-sl28cpld.
  F:    drivers/watchdog/sl28cpld_wdt.c
  
  SL28 VPD NVMEM LAYOUT DRIVER
 -M:    Michael Walle <m[email protected]>
 +M:    Michael Walle <m[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml
  F:    drivers/nvmem/layouts/sl28vpd.c
@@@ -20182,7 -20028,6 +20183,7 @@@ F:   include/linux/property.
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Song Liu <[email protected]>
 +R:    Yu Kuai <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-raid/list/
@@@ -20437,7 -20282,6 +20438,7 @@@ F:   drivers/media/dvb-frontends/sp2
  
  SPANISH DOCUMENTATION
  M:    Carlos Bilbao <[email protected]>
 +R:    Avadhut Naik <[email protected]>
  S:    Maintained
  F:    Documentation/translations/sp_SP/
  
@@@ -20504,7 -20348,7 +20505,7 @@@ F:   drivers/pinctrl/spear
  SPI NOR SUBSYSTEM
  M:    Tudor Ambarus <[email protected]>
  M:    Pratyush Yadav <[email protected]>
 -R:    Michael Walle <[email protected]>
 +M:    Michael Walle <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mtd.infradead.org/
@@@ -20716,15 -20560,6 +20717,15 @@@ M: Ion Badulescu <[email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STARFIVE CAMERA SUBSYSTEM DRIVER
 +M:    Jack Zhu <[email protected]>
 +M:    Changhuang Liang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/admin-guide/media/starfive_camss.rst
 +F:    Documentation/devicetree/bindings/media/starfive,jh7110-camss.yaml
 +F:    drivers/staging/media/starfive/camss
 +
  STARFIVE CRYPTO DRIVER
  M:    Jia Jie Ho <[email protected]>
  M:    William Qiu <[email protected]>
@@@ -21177,13 -21012,6 +21178,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/mmc/host/dw_mmc*
  
 +SYNOPSYS DESIGNWARE PCIE PMU DRIVER
 +M:    Shuai Xue <[email protected]>
 +M:    Jing Zhang <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/dwc_pcie_pmu.rst
 +F:    drivers/perf/dwc_pcie_pmu.c
 +
  SYNOPSYS HSDK RESET CONTROLLER DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Supported
@@@ -21425,12 -21253,6 +21426,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/media/rc/ttusbir.c
  
 +TECHWELL TW9900 VIDEO DECODER
 +M:    Mehdi Djait <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/tw9900.c
 +
  TECHWELL TW9910 VIDEO DECODER
  L:    [email protected]
  S:    Orphan
@@@ -21442,9 -21264,7 +21443,9 @@@ M:   Jens Wiklander <jens.wiklander@linar
  R:    Sumit Garg <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/staging/tee.rst
 +F:    Documentation/driver-api/tee.rst
 +F:    Documentation/tee/
 +F:    Documentation/userspace-api/tee.rst
  F:    drivers/tee/
  F:    include/linux/tee_drv.h
  F:    include/uapi/linux/tee.h
@@@ -21739,17 -21559,6 +21740,17 @@@ S: Maintaine
  F:    Documentation/ABI/testing/sysfs-class-firmware-attributes
  F:    drivers/platform/x86/think-lmi.?
  
 +THP7312 ISP DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +M:    Paul Elder <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/thine,thp7312.yaml
 +F:    Documentation/userspace-api/media/drivers/thp7312.rst
 +F:    drivers/media/i2c/thp7312.c
 +F:    include/uapi/linux/thp7312.h
 +
  THUNDERBOLT DMA TRAFFIC TEST DRIVER
  M:    Isaac Hazan <[email protected]>
  L:    [email protected]
@@@ -22226,7 -22035,7 +22227,7 @@@ F:   kernel/trace/trace_osnoise.
  F:    kernel/trace/trace_sched_wakeup.c
  
  TRADITIONAL CHINESE DOCUMENTATION
 -M:    Hu Haowen <[email protected]>
 +M:    Hu Haowen <[email protected]>
  S:    Maintained
  W:    https://github.com/srcres258/linux-doc
  T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
@@@ -22409,7 -22218,7 +22410,7 @@@ F:   drivers/usb/common/ulpi.
  F:    include/linux/ulpi/
  
  UNICODE SUBSYSTEM
 -M:    Gabriel Krisman Bertazi <krisman@collabora.com>
 +M:    Gabriel Krisman Bertazi <krisman@kernel.org>
  L:    [email protected]
  S:    Supported
  F:    fs/unicode/
@@@ -22451,8 -22260,7 +22452,8 @@@ S:   Maintaine
  F:    drivers/ufs/host/ufs-exynos*
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
 -M:    Stanley Chu <[email protected]>
 +M:    Peter Wang <[email protected]>
 +R:    Stanley Jhu <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -22783,6 -22591,11 +22784,6 @@@ F:  drivers/usb/gadget/function/*uvc
  F:    drivers/usb/gadget/legacy/webcam.c
  F:    include/uapi/linux/usb/g_uvc.h
  
 -USB WIRELESS RNDIS DRIVER (rndis_wlan)
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/net/wireless/legacy/rndis_wlan.c
 -
  USB XHCI DRIVER
  M:    Mathias Nyman <[email protected]>
  L:    [email protected]
@@@ -22790,6 -22603,12 +22791,6 @@@ S:  Supporte
  F:    drivers/usb/host/pci-quirks*
  F:    drivers/usb/host/xhci*
  
 -USB ZD1201 DRIVER
 -L:    [email protected]
 -S:    Orphan
 -W:    http://linux-lc100020.sourceforge.net
 -F:    drivers/net/wireless/zydas/zd1201.*
 -
  USER DATAGRAM PROTOCOL (UDP)
  M:    Willem de Bruijn <[email protected]>
  S:    Maintained
@@@ -22895,7 -22714,6 +22896,7 @@@ S:   Maintaine
  F:    Documentation/driver-api/media/camera-sensor.rst
  F:    Documentation/driver-api/media/tx-rx.rst
  F:    drivers/media/i2c/ar*
 +F:    drivers/media/i2c/gc*
  F:    drivers/media/i2c/hi*
  F:    drivers/media/i2c/imx*
  F:    drivers/media/i2c/mt*
@@@ -23390,8 -23208,9 +23391,8 @@@ F:   drivers/misc/vmw_vmci
  F:    include/linux/vmw_vmci*
  
  VMWARE VMMOUSE SUBDRIVER
 -M:    Zack Rusin <[email protected]>
 -R:    VMware Graphics Reviewers <[email protected]>
 -R:    VMware PV-Drivers Reviewers <[email protected]>
 +M:    Zack Rusin <[email protected]>
 +R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/input/mouse/vmmouse.c
@@@ -23538,14 -23357,6 +23539,14 @@@ F: include/linux/watchdog.
  F:    include/trace/events/watchdog.h
  F:    include/uapi/linux/watchdog.h
  
 +WAVE5 VPU CODEC DRIVER
 +M:    Nas Chung <[email protected]>
 +M:    Jackson Lee <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/cnm,wave521c.yaml
 +F:    drivers/media/platform/chips-media/wave5/
 +
  WHISKEYCOVE PMIC GPIO DRIVER
  M:    Kuppuswamy Sathyanarayanan <[email protected]>
  L:    [email protected]
@@@ -23599,6 -23410,11 +23600,6 @@@ M:  Miloslav Trmac <[email protected]
  S:    Maintained
  F:    drivers/input/misc/wistron_btns.c
  
 -WL3501 WIRELESS PCMCIA CARD DRIVER
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/net/wireless/legacy/wl3501*
 -
  WMI BINARY MOF DRIVER
  M:    Armin Wolf <[email protected]>
  R:    Thomas Weißschuh <[email protected]>
@@@ -23768,6 -23584,15 +23769,6 @@@ F:  drivers/platform/olpc
  F:    drivers/platform/x86/
  F:    include/linux/platform_data/x86/
  
 -X86 PLATFORM DRIVERS - ARCH
 -R:    Darren Hart <[email protected]>
 -R:    Andy Shevchenko <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
 -F:    arch/x86/platform
 -
  X86 PLATFORM UV HPE SUPERDOME FLEX
  M:    Steve Wahl <[email protected]>
  R:    Justin Ernst <[email protected]>
@@@ -23979,10 -23804,10 +23980,10 @@@ S:        Supporte
  W:    http://xfs.org/
  C:    irc://irc.oftc.net/xfs
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 -P:    Documentation/filesystems/xfs-maintainer-entry-profile.rst
 +P:    Documentation/filesystems/xfs/xfs-maintainer-entry-profile.rst
  F:    Documentation/ABI/testing/sysfs-fs-xfs
  F:    Documentation/admin-guide/xfs.rst
 -F:    Documentation/filesystems/xfs-*
 +F:    Documentation/filesystems/xfs/*
  F:    fs/xfs/
  F:    include/uapi/linux/dqblk_xfs.h
  F:    include/uapi/linux/fsmap.h
@@@ -24275,13 -24100,11 +24276,13 @@@ N:        zst
  K:    zstd
  
  ZSWAP COMPRESSED SWAP CACHING
 -M:    Seth Jennings <[email protected]>
 -M:    Dan Streetman <[email protected]>
 -M:    Vitaly Wool <vitaly.wool@konsulko.com>
 +M:    Johannes Weiner <[email protected]>
 +M:    Yosry Ahmed <[email protected]>
 +M:    Nhat Pham <nphamcs@gmail.com>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/mm/zswap.rst
 +F:    include/linux/zswap.h
  F:    mm/zswap.c
  
  THE REST

diff --combined arch/mips/boot/compressed/dbg.c
index 2f1ac38fe1ccac751d1be526660981507a34aebb,98dfb2e59dfeeaf2b30e4843e3666c02769cd92c..95405292accdff5e4211cd8ac4cababf2788d028
--- 1/arch/mips/boot/compressed/dbg.c
--- 2/arch/mips/boot/compressed/dbg.c
+++ b/arch/mips/boot/compressed/dbg.c
@@@ -3,14 -3,12 +3,14 @@@
   * MIPS-specific debug support for pre-boot environment
   *
   * NOTE: putc() is board specific, if your board have a 16550 compatible uart,
-  * please select SYS_SUPPORTS_ZBOOT_UART16550 for your machine. othewise, you
+  * please select SYS_SUPPORTS_ZBOOT_UART16550 for your machine. otherwise, you
   * need to implement your own putc().
   */
  #include <linux/compiler.h>
  #include <linux/types.h>
  
 +#include "decompress.h"
 +
  void __weak putc(char c)
  {
  }

diff --combined arch/mips/include/asm/io.h
index 85bbd967e05fa3ad2001fe1624d41304d951d745,bba327dc1226fe2aac608ac4feb23e9fa611f82b..af58d6ae06b85ea1f36ecc1cc676f9352d4a3ed1
--- 1/arch/mips/include/asm/io.h
--- 2/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@@ -13,6 -13,7 +13,6 @@@
  #define _ASM_IO_H
  
  #include <linux/compiler.h>
 -#include <linux/kernel.h>
  #include <linux/types.h>
  #include <linux/irqflags.h>
  
@@@ -24,6 -25,7 +24,6 @@@
  #include <asm/cpu-features.h>
  #include <asm/page.h>
  #include <asm/pgtable-bits.h>
 -#include <asm/processor.h>
  #include <asm/string.h>
  #include <mangle-port.h>
  
@@@ -39,11 -41,6 +39,11 @@@
  # define __raw_ioswabq(a, x)  (x)
  # define ____raw_ioswabq(a, x)        (x)
  
 +# define _ioswabb ioswabb
 +# define _ioswabw ioswabw
 +# define _ioswabl ioswabl
 +# define _ioswabq ioswabq
 +
  # define __relaxed_ioswabb ioswabb
  # define __relaxed_ioswabw ioswabw
  # define __relaxed_ioswabl ioswabl
@@@ -117,6 -114,23 +117,6 @@@ static inline phys_addr_t virt_to_phys(
        return __virt_to_phys(x);
  }
  
 -/*
 - *     phys_to_virt    -       map physical address to virtual
 - *     @address: address to remap
 - *
 - *     The returned virtual address is a current CPU mapping for
 - *     the memory address given. It is only valid to use this function on
 - *     addresses that have a kernel mapping
 - *
 - *     This function does not handle bus mappings for DMA transfers. In
 - *     almost all conceivable cases a device driver should not be using
 - *     this function
 - */
 -static inline void * phys_to_virt(unsigned long address)
 -{
 -      return __va(address);
 -}
 -
  /*
   * ISA I/O bus memory addresses are 1:1 with the physical address.
   */
@@@ -125,6 -139,11 +125,6 @@@ static inline unsigned long isa_virt_to
        return virt_to_phys(address);
  }
  
 -static inline void *isa_bus_to_virt(unsigned long address)
 -{
 -      return phys_to_virt(address);
 -}
 -
  /*
   * Change "struct page" to physical address.
   */
@@@ -147,6 -166,7 +147,6 @@@ void iounmap(const volatile void __iome
   */
  #define ioremap(offset, size)                                         \
        ioremap_prot((offset), (size), _CACHE_UNCACHED)
 -#define ioremap_uc            ioremap
  
  /*
   * ioremap_cache -    map bus memory into CPU space
@@@ -159,7 -179,7 +159,7 @@@
   * address is not guaranteed to be usable directly as a virtual
   * address.
   *
-  * This version of ioremap ensures that the memory is marked cachable by
+  * This version of ioremap ensures that the memory is marked cacheable by
   * the CPU.  Also enables full write-combining.        Useful for some
   * memory-like regions on I/O busses.
   */
@@@ -177,7 -197,7 +177,7 @@@
   * address is not guaranteed to be usable directly as a virtual
   * address.
   *
-  * This version of ioremap ensures that the memory is marked uncachable
+  * This version of ioremap ensures that the memory is marked uncacheable
   * but accelerated by means of write-combining feature. It is specifically
   * useful for PCIe prefetchable windows, which may vastly improve a
   * communications performance. If it was determined on boot stage, what
@@@ -187,6 -207,8 +187,6 @@@
  #define ioremap_wc(offset, size)                                      \
        ioremap_prot((offset), (size), boot_cpu_data.writecombine)
  
 -#include <asm-generic/iomap.h>
 -
  #if defined(CONFIG_CPU_CAVIUM_OCTEON)
  #define war_io_reorder_wmb()          wmb()
  #else
@@@ -274,9 -296,9 +274,9 @@@ static inline type pfx##read##bwlq(cons
        return pfx##ioswab##bwlq(__mem, __val);                         \
  }
  
 -#define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, barrier, relax, p)     \
 +#define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, barrier, relax)                \
                                                                        \
 -static inline void pfx##out##bwlq##p(type val, unsigned long port)    \
 +static inline void pfx##out##bwlq(type val, unsigned long port)               \
  {                                                                     \
        volatile type *__addr;                                          \
        type __val;                                                     \
@@@ -296,7 -318,7 +296,7 @@@
        *__addr = __val;                                                \
  }                                                                     \
                                                                        \
 -static inline type pfx##in##bwlq##p(unsigned long port)                       \
 +static inline type pfx##in##bwlq(unsigned long port)                  \
  {                                                                     \
        volatile type *__addr;                                          \
        type __val;                                                     \
@@@ -338,10 -360,11 +338,10 @@@ __BUILD_MEMORY_PFX(__mem_, q, u64, 0
  #endif
  
  #define __BUILD_IOPORT_PFX(bus, bwlq, type)                           \
 -      __BUILD_IOPORT_SINGLE(bus, bwlq, type, 1, 0,)                   \
 -      __BUILD_IOPORT_SINGLE(bus, bwlq, type, 1, 0, _p)
 +      __BUILD_IOPORT_SINGLE(bus, bwlq, type, 1, 0)
  
  #define BUILDIO_IOPORT(bwlq, type)                                    \
 -      __BUILD_IOPORT_PFX(, bwlq, type)                                \
 +      __BUILD_IOPORT_PFX(_, bwlq, type)                               \
        __BUILD_IOPORT_PFX(__mem_, bwlq, type)
  
  BUILDIO_IOPORT(b, u8)
@@@ -389,6 -412,14 +389,6 @@@ __BUILDIO(q, u64
  #define writeq_be(val, addr)                                          \
        __raw_writeq(cpu_to_be64((val)), (__force unsigned *)(addr))
  
 -/*
 - * Some code tests for these symbols
 - */
 -#ifdef CONFIG_64BIT
 -#define readq                         readq
 -#define writeq                                writeq
 -#endif
 -
  #define __BUILD_MEMORY_STRING(bwlq, type)                             \
                                                                        \
  static inline void writes##bwlq(volatile void __iomem *mem,           \
@@@ -449,6 -480,18 +449,6 @@@ BUILDSTRING(l, u32
  BUILDSTRING(q, u64)
  #endif
  
 -static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count)
 -{
 -      memset((void __force *) addr, val, count);
 -}
 -static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
 -{
 -      memcpy(dst, (void __force *) src, count);
 -}
 -static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count)
 -{
 -      memcpy((void __force *) dst, src, count);
 -}
  
  /*
   * The caches on some architectures aren't dma-coherent and have need to
@@@ -505,66 -548,13 +505,66 @@@ extern void (*_dma_cache_inv)(unsigned 
  #define csr_out32(v, a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
  #define csr_in32(a)    (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
  
 -/*
 - * Convert a physical pointer to a virtual kernel pointer for /dev/mem
 - * access
 - */
 -#define xlate_dev_mem_ptr(p)  __va(p)
 -#define unxlate_dev_mem_ptr(p, v) do { } while (0)
 +#define __raw_readb __raw_readb
 +#define __raw_readw __raw_readw
 +#define __raw_readl __raw_readl
 +#ifdef CONFIG_64BIT
 +#define __raw_readq __raw_readq
 +#endif
 +#define __raw_writeb __raw_writeb
 +#define __raw_writew __raw_writew
 +#define __raw_writel __raw_writel
 +#ifdef CONFIG_64BIT
 +#define __raw_writeq __raw_writeq
 +#endif
 +
 +#define readb readb
 +#define readw readw
 +#define readl readl
 +#ifdef CONFIG_64BIT
 +#define readq readq
 +#endif
 +#define writeb writeb
 +#define writew writew
 +#define writel writel
 +#ifdef CONFIG_64BIT
 +#define writeq writeq
 +#endif
 +
 +#define readsb readsb
 +#define readsw readsw
 +#define readsl readsl
 +#ifdef CONFIG_64BIT
 +#define readsq readsq
 +#endif
 +#define writesb writesb
 +#define writesw writesw
 +#define writesl writesl
 +#ifdef CONFIG_64BIT
 +#define writesq writesq
 +#endif
 +
 +#define _inb _inb
 +#define _inw _inw
 +#define _inl _inl
 +#define insb insb
 +#define insw insw
 +#define insl insl
 +
 +#define _outb _outb
 +#define _outw _outw
 +#define _outl _outl
 +#define outsb outsb
 +#define outsw outsw
 +#define outsl outsl
  
  void __ioread64_copy(void *to, const void __iomem *from, size_t count);
  
 +#include <asm-generic/io.h>
 +
 +static inline void *isa_bus_to_virt(unsigned long address)
 +{
 +      return phys_to_virt(address);
 +}
 +
  #endif /* _ASM_IO_H */

diff --combined arch/mips/kernel/cpu-probe.c
index de7460c3a72e914b573e7b2680dbd9d56866f58f,2f4fafdc5fccfb7c15e6fc8f6d4f1719f1e5668a..bda7f193baab9f6709e43212fbc2960a0eae1cc0
--- 1/arch/mips/kernel/cpu-probe.c
--- 2/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@@ -179,6 -179,7 +179,6 @@@ void __init check_bugs32(void
  static inline int cpu_has_confreg(void)
  {
  #ifdef CONFIG_CPU_R3000
 -      extern unsigned long r3k_cache_size(unsigned long);
        unsigned long size1, size2;
        unsigned long cfg = read_c0_conf();
  
@@@ -1138,7 -1139,7 +1138,7 @@@ static inline void cpu_probe_legacy(str
                 * This processor doesn't have an MMU, so it's not
                 * "real easy" to run Linux on it. It is left purely
                 * for documentation.  Commented out because it shares
-                * it's c0_prid id number with the TX3900.
+                * its c0_prid id number with the TX3900.
                 */
                c->cputype = CPU_R4650;
                __cpu_name[cpu] = "R4650";

diff --combined arch/mips/kernel/setup.c
index 328426c3ed6f9f74f2217a1c7811ae9fde94f0f9,844307a86b159aa7c1297893116db9f2b512e967..9c30de1515976159e0210724a6e19313832a0fad
--- 1/arch/mips/kernel/setup.c
--- 2/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@@ -42,7 -42,6 +42,7 @@@
  #include <asm/sections.h>
  #include <asm/setup.h>
  #include <asm/smp-ops.h>
 +#include <asm/mips-cps.h>
  #include <asm/prom.h>
  #include <asm/fw/fw.h>
  
@@@ -147,7 -146,7 +147,7 @@@ static unsigned long __init init_initrd
        /*
         * Board specific code or command line parser should have
         * already set up initrd_start and initrd_end. In these cases
-        * perfom sanity checks and use them if all looks good.
+        * perform sanity checks and use them if all looks good.
         */
        if (!initrd_start || initrd_end <= initrd_start)
                goto disable;
@@@ -322,11 -321,11 +322,11 @@@ static void __init bootmem_init(void
                panic("Incorrect memory mapping !!!");
  
        if (max_pfn > PFN_DOWN(HIGHMEM_START)) {
+               max_low_pfn = PFN_DOWN(HIGHMEM_START);
  #ifdef CONFIG_HIGHMEM
-               highstart_pfn = PFN_DOWN(HIGHMEM_START);
+               highstart_pfn = max_low_pfn;
                highend_pfn = max_pfn;
  #else
-               max_low_pfn = PFN_DOWN(HIGHMEM_START);
                max_pfn = max_low_pfn;
  #endif
        }

diff --combined arch/mips/kernel/signal.c
index ccbf580827f6e74f904070e48ccd1e39d0b5dce4,a8e20fdc7afd73340295d8abdaaca1af12356667..4a10f18a880604df29b5a7130ea2682b6c679c42
--- 1/arch/mips/kernel/signal.c
--- 2/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@@ -38,7 -38,6 +38,7 @@@
  #include <asm/dsp.h>
  #include <asm/inst.h>
  #include <asm/msa.h>
 +#include <asm/syscalls.h>
  
  #include "signal-common.h"
  
@@@ -570,7 -569,7 +570,7 @@@ void __user *get_sigframe(struct ksigna
                return (void __user __force *)(-1UL);
  
        /*
-        * FPU emulator may have it's own trampoline active just
+        * FPU emulator may have its own trampoline active just
         * above the user stack, 16-bytes before the next lowest
         * 16 byte boundary.  Try to avoid trashing it.
         */

diff --combined arch/mips/kernel/traps.c
index c58c0c3c5b40ceed5d61109ca29707f5cfc3572e,0e3f2f2fa732b4efdff391e62bdb0976747e3d8f..dec6878b35f627089226618ff4dc4628855c8eb4
--- 1/arch/mips/kernel/traps.c
--- 2/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@@ -2055,108 -2055,73 +2055,71 @@@ static void do_default_vi(void
        panic("Caught unexpected vectored interrupt.");
  }
  
- static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
+ void *set_vi_handler(int n, vi_handler_t addr)
  {
+       extern const u8 except_vec_vi[];
+       extern const u8 except_vec_vi_ori[], except_vec_vi_end[];
+       extern const u8 rollback_except_vec_vi[];
        unsigned long handler;
        unsigned long old_handler = vi_handlers[n];
        int srssets = current_cpu_data.srsets;
        u16 *h;
        unsigned char *b;
+       const u8 *vec_start;
+       int ori_offset;
+       int handler_len;
  
        BUG_ON(!cpu_has_veic && !cpu_has_vint);
  
        if (addr == NULL) {
                handler = (unsigned long) do_default_vi;
-               srs = 0;
        } else
                handler = (unsigned long) addr;
        vi_handlers[n] = handler;
  
        b = (unsigned char *)(ebase + 0x200 + n*VECTORSPACING);
  
-       if (srs >= srssets)
-               panic("Shadow register set %d not supported", srs);
- 
        if (cpu_has_veic) {
                if (board_bind_eic_interrupt)
-                       board_bind_eic_interrupt(n, srs);
+                       board_bind_eic_interrupt(n, 0);
        } else if (cpu_has_vint) {
                /* SRSMap is only defined if shadow sets are implemented */
                if (srssets > 1)
-                       change_c0_srsmap(0xf << n*4, srs << n*4);
+                       change_c0_srsmap(0xf << n*4, 0 << n*4);
        }
  
-       if (srs == 0) {
-               /*
-                * If no shadow set is selected then use the default handler
-                * that does normal register saving and standard interrupt exit
-                */
-               extern const u8 except_vec_vi[], except_vec_vi_lui[];
-               extern const u8 except_vec_vi_ori[], except_vec_vi_end[];
-               extern const u8 rollback_except_vec_vi[];
-               const u8 *vec_start = using_rollback_handler() ?
-                                     rollback_except_vec_vi : except_vec_vi;
+       vec_start = using_rollback_handler() ? rollback_except_vec_vi :
+                                              except_vec_vi;
  #if defined(CONFIG_CPU_MICROMIPS) || defined(CONFIG_CPU_BIG_ENDIAN)
-               const int lui_offset = except_vec_vi_lui - vec_start + 2;
-               const int ori_offset = except_vec_vi_ori - vec_start + 2;
+       ori_offset = except_vec_vi_ori - vec_start + 2;
  #else
-               const int lui_offset = except_vec_vi_lui - vec_start;
-               const int ori_offset = except_vec_vi_ori - vec_start;
+       ori_offset = except_vec_vi_ori - vec_start;
  #endif
-               const int handler_len = except_vec_vi_end - vec_start;
+       handler_len = except_vec_vi_end - vec_start;
  
-               if (handler_len > VECTORSPACING) {
-                       /*
-                        * Sigh... panicing won't help as the console
-                        * is probably not configured :(
-                        */
-                       panic("VECTORSPACING too small");
-               }
- 
-               set_handler(((unsigned long)b - ebase), vec_start,
- #ifdef CONFIG_CPU_MICROMIPS
-                               (handler_len - 1));
- #else
-                               handler_len);
- #endif
-               h = (u16 *)(b + lui_offset);
-               *h = (handler >> 16) & 0xffff;
-               h = (u16 *)(b + ori_offset);
-               *h = (handler & 0xffff);
-               local_flush_icache_range((unsigned long)b,
-                                        (unsigned long)(b+handler_len));
-       }
-       else {
+       if (handler_len > VECTORSPACING) {
                /*
-                * In other cases jump directly to the interrupt handler. It
-                * is the handler's responsibility to save registers if required
-                * (eg hi/lo) and return from the exception using "eret".
+                * Sigh... panicing won't help as the console
+                * is probably not configured :(
                 */
-               u32 insn;
+               panic("VECTORSPACING too small");
+       }
  
-               h = (u16 *)b;
-               /* j handler */
+       set_handler(((unsigned long)b - ebase), vec_start,
  #ifdef CONFIG_CPU_MICROMIPS
-               insn = 0xd4000000 | (((u32)handler & 0x07ffffff) >> 1);
+                       (handler_len - 1));
  #else
-               insn = 0x08000000 | (((u32)handler & 0x0fffffff) >> 2);
+                       handler_len);
  #endif
-               h[0] = (insn >> 16) & 0xffff;
-               h[1] = insn & 0xffff;
-               h[2] = 0;
-               h[3] = 0;
-               local_flush_icache_range((unsigned long)b,
-                                        (unsigned long)(b+8));
-       }
+       /* insert offset into vi_handlers[] */
+       h = (u16 *)(b + ori_offset);
+       *h = n * sizeof(handler);
+       local_flush_icache_range((unsigned long)b,
+                                (unsigned long)(b+handler_len));
  
        return (void *)old_handler;
  }
  
- void *set_vi_handler(int n, vi_handler_t addr)
- {
-       return set_vi_srs_handler(n, addr, 0);
- }
 -extern void tlb_init(void);
--
  /*
   * Timer interrupt
   */
@@@ -2416,7 -2381,7 +2379,7 @@@ void __init trap_init(void
                set_except_vector(i, handle_reserved);
  
        /*
-        * Copy the EJTAG debug exception vector handler code to it's final
+        * Copy the EJTAG debug exception vector handler code to its final
         * destination.
         */
        if (cpu_has_ejtag && board_ejtag_handler_setup)

diff --combined arch/mips/loongson64/smp.c
index 498bdc1bb0ede8aafbf1767065a9002fb2e4b26f,4f6c714430daacf787e236df1216a3787b341733..5a990cdef91a6fb44d4b89688022441a85a4303f
--- 1/arch/mips/loongson64/smp.c
--- 2/arch/mips/loongson64/smp.c
+++ b/arch/mips/loongson64/smp.c
@@@ -516,7 -516,7 +516,7 @@@ static void __init loongson3_prepare_cp
  }
  
  /*
-  * Setup the PC, SP, and GP of a secondary processor and start it runing!
+  * Setup the PC, SP, and GP of a secondary processor and start it running!
   */
  static int loongson3_boot_secondary(int cpu, struct task_struct *idle)
  {
@@@ -864,7 -864,7 +864,7 @@@ const struct plat_smp_ops loongson3_smp
        .cpu_disable = loongson3_cpu_disable,
        .cpu_die = loongson3_cpu_die,
  #endif
 -#ifdef CONFIG_KEXEC
 +#ifdef CONFIG_KEXEC_CORE
        .kexec_nonboot_cpu = kexec_nonboot_cpu_jump,
  #endif
  };

diff --combined arch/mips/mm/c-r4k.c
index b45bf026ee55e662f328ca4dc162b1365afd3563,20d37773b162b78461ca95f23710897f2d91adb2..10413b6f6662bcf99433725cf4c037a91308b155
--- 1/arch/mips/mm/c-r4k.c
--- 2/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@@ -1485,6 -1485,10 +1485,6 @@@ static void loongson3_sc_init(void
        return;
  }
  
 -extern int r5k_sc_init(void);
 -extern int rm7k_sc_init(void);
 -extern int mips_sc_init(void);
 -
  static void setup_scache(void)
  {
        struct cpuinfo_mips *c = &current_cpu_data;
@@@ -1650,7 -1654,7 +1650,7 @@@ static void coherency_setup(void
  
        /*
         * c0_status.cu=0 specifies that updates by the sc instruction use
-        * the coherency mode specified by the TLB; 1 means cachable
+        * the coherency mode specified by the TLB; 1 means cacheable
         * coherent update on write will be used.  Not all processors have
         * this bit and; some wire it to zero, others like Toshiba had the
         * silly idea of putting something else there ...
@@@ -1824,7 -1828,7 +1824,7 @@@ static struct notifier_block r4k_cache_
        .notifier_call = r4k_cache_pm_notifier,
  };
  
 -int __init r4k_cache_init_pm(void)
 +static int __init r4k_cache_init_pm(void)
  {
        return cpu_pm_register_notifier(&r4k_cache_pm_notifier_block);
  }

diff --combined arch/mips/mm/init.c
index c2e0e5aebe903199dfcd144b46e4e6c2b798c26d,b2dce07116e8a78516be266dded81e4490e0b4f8..39f129205b0c30d3926fe40bbb30921873d6e7c5
--- 1/arch/mips/mm/init.c
--- 2/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@@ -38,7 -38,6 +38,7 @@@
  #include <asm/dma.h>
  #include <asm/maar.h>
  #include <asm/mmu_context.h>
 +#include <asm/mmzone.h>
  #include <asm/sections.h>
  #include <asm/pgalloc.h>
  #include <asm/tlb.h>
@@@ -422,8 -421,17 +422,17 @@@ void __init paging_init(void
                       " %ldk highmem ignored\n",
                       (highend_pfn - max_low_pfn) << (PAGE_SHIFT - 10));
                max_zone_pfns[ZONE_HIGHMEM] = max_low_pfn;
+ 
+               max_mapnr = max_low_pfn;
+       } else if (highend_pfn) {
+               max_mapnr = highend_pfn;
+       } else {
+               max_mapnr = max_low_pfn;
        }
+ #else
+       max_mapnr = max_low_pfn;
  #endif
+       high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
  
        free_area_init(max_zone_pfns);
  }
@@@ -459,13 -467,6 +468,6 @@@ void __init mem_init(void
         */
        BUILD_BUG_ON(IS_ENABLED(CONFIG_32BIT) && (PFN_PTE_SHIFT > PAGE_SHIFT));
  
- #ifdef CONFIG_HIGHMEM
-       max_mapnr = highend_pfn ? highend_pfn : max_low_pfn;
- #else
-       max_mapnr = max_low_pfn;
- #endif
-       high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
- 
        maar_init();
        memblock_free_all();
        setup_zero_pages();     /* Setup zeroed pages.  */

diff --combined arch/mips/mm/tlb-r3k.c
index f6db65410c655ae1fe27e37915e06a4b0d577174,22a8f488ae1d667d7669c5259d02ac9e98926401..173f7b36033bd222f542b3277f80435c8d6ea6c2
--- 1/arch/mips/mm/tlb-r3k.c
--- 2/arch/mips/mm/tlb-r3k.c
+++ b/arch/mips/mm/tlb-r3k.c
@@@ -23,11 -23,11 +23,11 @@@
  #include <asm/io.h>
  #include <asm/bootinfo.h>
  #include <asm/cpu.h>
 +#include <asm/setup.h>
 +#include <asm/tlbex.h>
  
  #undef DEBUG_TLB
  
 -extern void build_tlb_refill_handler(void);
 -
  /* CP0 hazard avoidance. */
  #define BARRIER                               \
        __asm__ __volatile__(           \
@@@ -183,7 -183,7 +183,7 @@@ void __update_tlb(struct vm_area_struc
        int idx, pid;
  
        /*
-        * Handle debugger faulting in for debugee.
+        * Handle debugger faulting in for debuggee.
         */
        if (current->active_mm != vma->vm_mm)
                return;

diff --combined arch/mips/mm/tlb-r4k.c
index 7e2a0011a6fb9b8516125a492b99db4ba16471cc,128a0a5ec2b7fa16841fda23bd6923b66cc68281..4106084e57d728679753880eec82892f693f61fb
--- 1/arch/mips/mm/tlb-r4k.c
--- 2/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@@ -22,9 -22,9 +22,9 @@@
  #include <asm/hazards.h>
  #include <asm/mmu_context.h>
  #include <asm/tlb.h>
 +#include <asm/tlbex.h>
  #include <asm/tlbmisc.h>
 -
 -extern void build_tlb_refill_handler(void);
 +#include <asm/setup.h>
  
  /*
   * LOONGSON-2 has a 4 entry itlb which is a subset of jtlb, LOONGSON-3 has
@@@ -301,7 -301,7 +301,7 @@@ void __update_tlb(struct vm_area_struc
        int idx, pid;
  
        /*
-        * Handle debugger faulting in for debugee.
+        * Handle debugger faulting in for debuggee.
         */
        if (current->active_mm != vma->vm_mm)
                return;
@@@ -458,7 -458,6 +458,7 @@@ EXPORT_SYMBOL(has_transparent_hugepage)
  
  int temp_tlb_entry;
  
 +#ifndef CONFIG_64BIT
  __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
                               unsigned long entryhi, unsigned long pagemask)
  {
@@@ -497,7 -496,6 +497,7 @@@ out
        local_irq_restore(flags);
        return ret;
  }
 +#endif
  
  static int ntlb;
  static int __init set_ntlb(char *str)