Merge tag 'memblock-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...

Pull memblock updates from Mike Rapoport:
 "Test suite and a small cleanup:

   - A small cleanup of unused variable in __next_mem_pfn_range_in_zone

   - Initial test suite to simulate memblock behaviour in userspace"

* tag 'memblock-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: (27 commits)
  memblock tests: Add TODO and README files
  memblock tests: Add memblock_alloc_try_nid tests for bottom up
  memblock tests: Add memblock_alloc_try_nid tests for top down
  memblock tests: Add memblock_alloc_from tests for bottom up
  memblock tests: Add memblock_alloc_from tests for top down
  memblock tests: Add memblock_alloc tests for bottom up
  memblock tests: Add memblock_alloc tests for top down
  memblock tests: Add simulation of physical memory
  memblock tests: Split up reset_memblock function
  memblock tests: Fix testing with 32-bit physical addresses
  memblock: __next_mem_pfn_range_in_zone: remove unneeded local variable nid
  memblock tests: Add memblock_free tests
  memblock tests: Add memblock_add_node test
  memblock tests: Add memblock_remove tests
  memblock tests: Add memblock_reserve tests
  memblock tests: Add memblock_add tests
  memblock tests: Add memblock reset function
  memblock tests: Add skeleton of the memblock simulator
  tools/include: Add debugfs.h stub
  tools/include: Add pfn.h stub
  ...

diff --combined MAINTAINERS
index d55cb69c122954cb8f6597a1ff7bd23ed42d2e9c,38502bf0231a4abad30641f7ddbd6a108592eec2..b555a5e8704f2145726f413442ee47462b863138
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -389,11 -389,11 +389,11 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/acpi/arm64
  
 -ACPI I2C MULTI INSTANTIATE DRIVER
 +ACPI SERIAL MULTI INSTANTIATE DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -989,16 -989,6 +989,16 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/platform/x86/amd-pmc.*
  
 +AMD HSMP DRIVER
 +M:    Naveen Krishna Chatradhi <[email protected]>
 +R:    Carlos Bilbao <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/x86/amd_hsmp.rst
 +F:    arch/x86/include/asm/amd_hsmp.h
 +F:    arch/x86/include/uapi/asm/amd_hsmp.h
 +F:    drivers/platform/x86/amd_hsmp.c
 +
  AMD POWERPLAY AND SWSMU
  M:    Evan Quan <[email protected]>
  L:    [email protected]
@@@ -1012,7 -1002,6 +1012,7 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -1042,15 -1031,6 +1042,15 @@@ S:    Maintaine
  F:    Documentation/hid/amd-sfh*
  F:    drivers/hid/amd-sfh-hid/
  
 +AMPHION VPU CODEC V4L2 DRIVER
 +M:    Ming Qian <[email protected]>
 +M:    Shijie Qin <[email protected]>
 +M:    Zhou Peng <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/amphion,vpu.yaml
 +F:    drivers/media/platform/amphion/
 +
  AMS AS73211 DRIVER
  M:    Christian Eggers <[email protected]>
  L:    [email protected]
@@@ -1249,6 -1229,18 +1249,6 @@@ S:     Supporte
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
  
 -ANDES ARCHITECTURE
 -M:    Nick Hu <[email protected]>
 -M:    Greentime Hu <[email protected]>
 -M:    Vincent Chen <[email protected]>
 -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 <[email protected]>
  S:    Supported
@@@ -1695,9 -1687,9 +1695,9 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
 -R:    Jernej Skrabec <[email protected]>
 +M:    Jernej Skrabec <[email protected]>
 +M:    Samuel Holland <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1777,7 -1769,7 +1777,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
@@@ -2127,6 -2119,13 +2127,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 <[email protected]>
 -L:    [email protected] (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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2255,7 -2254,7 +2255,7 @@@ F:      drivers/phy/mediatek
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
 -M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://www.linux4sam.org
@@@ -2368,7 -2367,6 +2368,7 @@@ L:      [email protected] (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*
@@@ -2379,7 -2377,6 +2379,7 @@@ ARM/NUVOTON WPCM450 ARCHITECTUR
  M:    Jonathan Neuschäfer <[email protected]>
  L:    [email protected] (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
@@@ -2510,7 -2507,7 +2510,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/arm/rda.yaml
  F:    Documentation/devicetree/bindings/gpio/gpio-rda.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
 -F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
 +F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
  F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
  F:    arch/arm/boot/dts/rda8810pl-*
  F:    drivers/clocksource/timer-rda.c
@@@ -2534,7 -2531,6 +2534,7 @@@ M:      Magnus Damm <[email protected]
  L:    [email protected]
  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/
@@@ -2576,7 -2572,7 +2576,7 @@@ F:      sound/soc/rockchip
  N:    rockchip
  
  ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -2618,7 -2614,7 +2618,7 @@@ M:      Łukasz Stelmach <l.stelmach@samsung
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  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 <[email protected]>
@@@ -2635,7 -2631,7 +2635,7 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  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 <[email protected]>
@@@ -2643,7 -2639,7 +2643,7 @@@ M:      Andrzej Hajda <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s5p-mfc/
 +F:    drivers/media/platform/samsung/s5p-mfc/
  
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
@@@ -2651,7 -2647,6 +2651,7 @@@ M:      Magnus Damm <[email protected]
  L:    [email protected]
  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*
@@@ -2713,7 -2708,7 +2713,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
@@@ -2744,7 -2739,7 +2744,7 @@@ N:      stm3
  N:    stm
  
  ARM/Synaptics SoC support
 -M:    Jisheng Zhang <[email protected]>
 +M:    Jisheng Zhang <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2765,14 -2760,6 +2765,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 <[email protected]>
 +M:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +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)
@@@ -3037,7 -3024,7 +3037,7 @@@ L:      [email protected]
  L:    [email protected] (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 <[email protected]>
@@@ -3069,12 -3056,6 +3069,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_ec_sensors.c
  
 +ASUS EC HARDWARE MONITOR DRIVER
 +M:    Eugene Shalygin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/asus-ec-sensors.c
 +
  ASUS WIRELESS RADIO CONTROL DRIVER
  M:    João Paulo Rechi Vita <[email protected]>
  L:    [email protected]
@@@ -3158,9 -3139,11 +3158,9 @@@ W:     https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <[email protected]>
  L:    [email protected]
 -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
@@@ -3217,7 -3200,6 +3217,7 @@@ ATOMIC INFRASTRUCTUR
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  R:    Boqun Feng <[email protected]>
 +R:    Mark Rutland <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
@@@ -3399,7 -3381,7 +3399,7 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -3460,7 -3442,6 +3460,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
@@@ -3548,8 -3529,6 +3548,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/
@@@ -3842,6 -3821,9 +3842,6 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <[email protected]>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
 -M:    Chi-hsien Lin <[email protected]>
 -M:    Wright Feng <[email protected]>
 -M:    Chung-hsien Hsu <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -3925,7 -3907,7 +3925,7 @@@ M:      Scott Branden <[email protected]
  M:    [email protected]
  L:    [email protected] (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*
@@@ -4046,7 -4028,6 +4046,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/nand/raw/brcmnand/
 +F:    include/linux/platform_data/brcmnand.h
  
  BROADCOM STB PCIE DRIVER
  M:    Jim Quinlan <[email protected]>
@@@ -4264,7 -4245,7 +4264,7 @@@ L:      [email protected]
  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:    [email protected]
@@@ -4467,7 -4448,6 +4467,7 @@@ F:      drivers/power/supply/cw2015_battery.
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <[email protected]>
  M:    Jeff Layton <[email protected]>
 +M:    Xiubo Li <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://ceph.com/
@@@ -4478,7 -4458,6 +4478,7 @@@ F:      net/ceph
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
  M:    Jeff Layton <[email protected]>
 +M:    Xiubo Li <[email protected]>
  M:    Ilya Dryomov <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4570,7 -4549,6 +4570,7 @@@ F:      drivers/platform/chrome
  
  CHROMEOS EC CODEC DRIVER
  M:    Cheng-Yi Chiang <[email protected]>
 +M:    Tzung-Bi Shih <[email protected]>
  R:    Guenter Roeck <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
@@@ -4790,7 -4768,7 +4790,7 @@@ M:      Philipp Zabel <[email protected]
  L:    [email protected]
  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 <[email protected]>
@@@ -4936,8 -4914,7 +4936,8 @@@ F:      kernel/cgroup/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <[email protected]>
  M:    Michal Hocko <[email protected]>
 -M:    Vladimir Davydov <[email protected]>
 +M:    Roman Gushchin <[email protected]>
 +M:    Shakeel Butt <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5340,7 -5317,6 +5340,7 @@@ DATA ACCESS MONITO
  M:    SeongJae Park <[email protected]>
  L:    [email protected]
  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
@@@ -5434,7 -5410,6 +5434,7 @@@ F:      drivers/platform/x86/dell/dell-rbtn.
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <[email protected]>
  S:    Maintained
 +F:    Documentation/ABI/obsolete/procfs-i8k
  F:    drivers/hwmon/dell-smm-hwmon.c
  F:    include/uapi/linux/i8k.h
  
@@@ -5504,7 -5479,7 +5504,7 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -5616,7 -5591,7 +5616,7 @@@ F:      include/linux/devm-helpers.
  
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
 -M:    Mike Snitzer <snitzer@redhat.com>
 +M:    Mike Snitzer <snitzer@kernel.org>
  M:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5764,7 -5739,7 +5764,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
  
@@@ -6107,8 -6082,7 +6107,8 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -6137,14 -6111,6 +6137,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 <[email protected]>
 +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 <[email protected]>
  M:    Sean Paul <[email protected]>
@@@ -6165,13 -6131,6 +6165,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 <[email protected]>
 +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 <[email protected]>
  S:    Maintained
@@@ -6208,13 -6167,6 +6208,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 <[email protected]>
 +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 <[email protected]>
  M:    Gerd Hoffmann <[email protected]>
@@@ -6303,6 -6255,12 +6303,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 <[email protected]>
 -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 <[email protected]>
  S:    Maintained
@@@ -6349,8 -6307,8 +6349,8 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/vboxvideo/
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
 -M:    "VMware Graphics" <[email protected]>
  M:    Zack Rusin <[email protected]>
 +R:    VMware Graphics Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6444,7 -6402,6 +6444,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
  F:    Documentation/devicetree/bindings/display/exynos/
 +F:    Documentation/devicetree/bindings/display/samsung/
  F:    drivers/gpu/drm/exynos/
  F:    include/uapi/drm/exynos_drm.h
  
@@@ -7055,6 -7012,12 +7055,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 -EDAC-SIFIVE
 -M:    Yash Shah <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/edac/sifive_edac.c
 -
  EDAC-SKYLAKE
  M:    Tony Luck <[email protected]>
  L:    [email protected]
@@@ -7225,7 -7188,7 +7225,7 @@@ F:      drivers/net/can/usb/etas_es58x
  
  ETHERNET BRIDGE
  M:    Roopa Prabhu <[email protected]>
 -M:    Nikolay Aleksandrov <[email protected]>
 +M:    Nikolay Aleksandrov <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -7268,9 -7231,6 +7268,9 @@@ F:      net/core/of_net.
  EXEC & BINFMT API
  R:    Eric Biederman <[email protected]>
  R:    Kees Cook <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
  F:    arch/alpha/kernel/binfmt_loader.c
  F:    arch/x86/ia32/ia32_aout.c
  F:    fs/*binfmt_*.c
@@@ -7278,7 -7238,6 +7278,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
@@@ -7314,9 -7273,7 +7314,9 @@@ Extended Verification Module (EVM
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -7793,7 -7750,8 +7793,7 @@@ M:      Qiang Zhao <[email protected]
  L:    [email protected]
  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 <[email protected]>
@@@ -7824,7 -7782,6 +7824,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 <[email protected]>
@@@ -7835,10 -7792,10 +7835,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 <[email protected]>
  R:    Fabio Estevam <[email protected]>
 -R:    Shengjiu Wang <shengjiu.wang@gmail.com>
 +R:    Nicolin Chen <nicoleotsuka@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -7979,12 -7936,6 +7979,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-tablet.c
  
 +FUNGIBLE ETHERNET DRIVERS
 +M:    Dimitris Michailidis <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/fungible/
 +
  FUSE: FILESYSTEM IN USERSPACE
  M:    Miklos Szeredi <[email protected]>
  L:    [email protected]
@@@ -8698,7 -8649,7 +8698,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:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-hpre
@@@ -8758,9 -8709,9 +8758,9 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -8778,8 -8729,8 +8778,8 @@@ F:      Documentation/devicetree/bindings/sc
  F:    drivers/scsi/hisi_sas/
  
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 -M:    Zaibo Xu <[email protected]>
  M:    Kai Ye <[email protected]>
 +M:    Longfang Liu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-sec
@@@ -8810,7 -8761,7 +8810,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
  
@@@ -8924,7 -8875,7 +8924,7 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -8959,12 -8910,6 +8959,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/hi846.c
  
 +HYNIX HI847 SENSOR DRIVER
 +M:    Shawn Tu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/hi847.c
 +
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
@@@ -9319,15 -9264,6 +9319,15 @@@ S:    Maintaine
  W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
 +IDMAPPED MOUNTS
 +M:    Christian Brauner <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  S:    Maintained
@@@ -9539,11 -9475,6 +9539,11 @@@ F:    include/linux/mfd/ingenic-tcu.
  F:    sound/soc/codecs/jz47*
  F:    sound/soc/jz4740/
  
 +INJOINIC IP5xxx POWER BANK IC DRIVER
 +M:    Samuel Holland <[email protected]>
 +S:    Maintained
 +F:    drivers/power/supply/ip5xxx_power.c
 +
  INOTIFY
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -9590,7 -9521,6 +9590,7 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -9951,13 -9881,6 +9951,13 @@@ S:    Maintaine
  F:    arch/x86/include/asm/intel_scu_ipc.h
  F:    drivers/platform/x86/intel_scu_*
  
 +INTEL SDSI DRIVER
 +M:    David E. Box <[email protected]>
 +S:    Supported
 +F:    drivers/platform/x86/intel/sdsi.c
 +F:    tools/arch/x86/intel_sdsi/
 +F:    tools/testing/selftests/drivers/sdsi/
 +
  INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
  M:    Daniel Scally <[email protected]>
  S:    Maintained
@@@ -9994,7 -9917,7 +9994,7 @@@ INTEL UNCORE FREQUENCY CONTRO
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/intel/uncore-frequency.c
 +F:    drivers/platform/x86/intel/uncore-frequency/
  
  INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
  M:    David E. Box <[email protected]>
@@@ -10091,14 -10014,6 +10091,14 @@@ L: [email protected]
  F:    Documentation/devicetree/bindings/counter/interrupt-counter.yaml
  F:    drivers/counter/interrupt-cnt.c
  
 +INTERSIL ISL7998X VIDEO DECODER DRIVER
 +M:    Michael Tretter <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -10146,13 -10061,6 +10146,13 @@@ F: include/linux/iova.
  F:    include/linux/of_iommu.h
  F:    include/uapi/linux/iommu.h
  
 +IOSYS-MAP HELPERS
 +M:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    include/linux/iosys-map.h
 +
  IO_URING
  M:    Jens Axboe <[email protected]>
  R:    Pavel Begunkov <[email protected]>
@@@ -10172,7 -10080,6 +10172,7 @@@ M:   Corey Minyard <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://openipmi.sourceforge.net/
 +T:    git https://github.com/cminyard/linux-ipmi.git for-next
  F:    Documentation/driver-api/ipmi.rst
  F:    Documentation/devicetree/bindings/ipmi/
  F:    drivers/char/ipmi/
@@@ -10406,7 -10313,7 +10406,7 @@@ M:   Mikhail Ulyanov <mikhail.ulyanov@cog
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/rcar_jpu.c
 +F:    drivers/media/platform/renesas/rcar_jpu.c
  
  JSM Neo PCI based serial card
  L:    [email protected]
@@@ -10545,8 -10452,6 +10545,8 @@@ KERNEL REGRESSION
  M:    Thorsten Leemhuis <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/admin-guide/reporting-regressions.rst
 +F:    Documentation/process/handling-regressions.rst
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <[email protected]>
@@@ -10654,8 -10559,8 +10654,8 @@@ F:   arch/riscv/kvm
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
  M:    Janosch Frank <[email protected]>
 +M:    Claudio Imbrenda <[email protected]>
  R:    David Hildenbrand <[email protected]>
 -R:    Claudio Imbrenda <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -10752,14 -10657,6 +10752,14 @@@ F: include/linux/keyctl.
  F:    include/uapi/linux/keyctl.h
  F:    security/keys/
  
 +KEYS/KEYRINGS_INTEGRITY
 +M:    Jarkko Sakkinen <[email protected]>
 +M:    Mimi Zohar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    security/integrity/platform_certs
 +
  KFENCE
  M:    Alexander Potapenko <[email protected]>
  M:    Marco Elver <[email protected]>
@@@ -10865,6 -10762,7 +10865,6 @@@ L7 BPF FRAMEWOR
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Jakub Sitnicki <[email protected]>
 -M:    Lorenz Bauer <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11229,17 -11127,12 +11229,17 @@@ F:        lib/list-test.
  LITEX PLATFORM
  M:    Karol Gugala <[email protected]>
  M:    Mateusz Holenko <[email protected]>
 +M:    Gabriel Somlo <[email protected]>
 +M:    Joel Stanley <[email protected]>
  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 <[email protected]>
@@@ -11432,13 -11325,6 +11432,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -11786,7 -11672,7 +11786,7 @@@ F:   drivers/iio/proximity/mb1232.
  
  MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
  R:    Iskren Chernev <[email protected]>
 -R:    Krzysztof Kozlowski <krz[email protected]>
 +R:    Krzysztof Kozlowski <krz[email protected]>
  R:    Marek Szyprowski <[email protected]>
  R:    Matheus Castello <[email protected]>
  L:    [email protected]
@@@ -11796,7 -11682,7 +11796,7 @@@ F:   drivers/power/supply/max17040_batter
  
  MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
  R:    Hans de Goede <[email protected]>
 -R:    Krzysztof Kozlowski <krz[email protected]>
 +R:    Krzysztof Kozlowski <krz[email protected]>
  R:    Marek Szyprowski <[email protected]>
  R:    Sebastian Krzyszkowiak <[email protected]>
  R:    Purism Kernel Team <[email protected]>
@@@ -11826,18 -11712,11 +11826,18 @@@ F:        drivers/power/supply/max77650-charge
  F:    drivers/regulator/max77650-regulator.c
  F:    include/linux/mfd/max77650.h
  
 +MAXIM MAX77714 PMIC MFD DRIVER
 +M:    Luca Ceresoli <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mfd/maxim,max77714.yaml
 +F:    drivers/mfd/max77714.c
 +F:    include/linux/mfd/max77714.h
 +
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:    Javier Martinez Canillas <[email protected]>
  L:    [email protected]
  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
  
@@@ -11848,28 -11727,23 +11848,28 @@@ F:        Documentation/devicetree/bindings/po
  F:    drivers/power/supply/max77976_charger.c
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
 +F:    Documentation/devicetree/bindings/*/maxim,max77693.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
@@@ -11965,7 -11839,7 +11965,7 @@@ M:   Philipp Zabel <[email protected]
  L:    [email protected]
  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 <[email protected]>
@@@ -12030,10 -11904,10 +12030,10 @@@ L:        [email protected]
  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 <[email protected]>
@@@ -12088,7 -11962,7 +12088,7 @@@ L:   [email protected]
  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 <[email protected]>
@@@ -12097,7 -11971,7 +12097,7 @@@ L:   [email protected]
  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
@@@ -12107,7 -11981,7 +12107,7 @@@ L:   [email protected]
  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 <[email protected]>
@@@ -12116,7 -11990,7 +12116,7 @@@ L:   [email protected]
  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
@@@ -12126,7 -12000,7 +12126,7 @@@ L:   [email protected]
  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 <[email protected]>
@@@ -12137,8 -12011,8 +12137,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 <[email protected]>
@@@ -12148,7 -12022,7 +12148,7 @@@ L:   [email protected]
  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:    [email protected]
@@@ -12170,7 -12044,7 +12170,7 @@@ L:   [email protected]
  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 <[email protected]>
@@@ -12254,7 -12128,7 +12254,7 @@@ M:   Rick Chang <[email protected]
  M:    Bin Liu <[email protected]>
  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 <[email protected]>
@@@ -12262,8 -12136,8 +12262,8 @@@ M:   Houlong Wei <[email protected]
  M:    Andrew-CT Chen <[email protected]>
  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 <[email protected]>
@@@ -12271,8 -12145,8 +12271,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 <[email protected]>
@@@ -12288,7 -12162,6 +12288,7 @@@ R:   Shayne Chen <[email protected]
  R:    Sean Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
  F:    drivers/net/wireless/mediatek/mt76/
  
  MEDIATEK MT7601U WIRELESS LAN DRIVER
@@@ -12550,9 -12423,10 +12550,10 @@@ S: Maintaine
  F:    Documentation/core-api/boot-time-mm.rst
  F:    include/linux/memblock.h
  F:    mm/memblock.c
+ F:    tools/testing/memblock/
  
  MEMORY CONTROLLER DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
@@@ -12648,7 -12522,7 +12649,7 @@@ L:   [email protected]
  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 <[email protected]>
@@@ -12730,13 -12604,6 +12731,13 @@@ L: [email protected] (moderat
  S:    Supported
  F:    sound/soc/atmel
  
 +MICROCHIP CSI2DC DRIVER
 +M:    Eugen Hristev <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
 +F:    drivers/media/platform/atmel/microchip-csi2dc.c
 +
  MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
@@@ -12762,8 -12629,11 +12763,8 @@@ L:  [email protected]
  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
@@@ -13504,7 -13374,6 +13505,7 @@@ F:   net/core/drop_monitor.
  NETWORKING DRIVERS
  M:    "David S. Miller" <[email protected]>
  M:    Jakub Kicinski <[email protected]>
 +M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13551,7 -13420,6 +13552,7 @@@ F:   tools/testing/selftests/drivers/net/
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
  M:    Jakub Kicinski <[email protected]>
 +M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13695,7 -13563,7 +13696,7 @@@ F:   include/uapi/linux/nexthop.
  F:    net/ipv4/nexthop.c
  
  NFC SUBSYSTEM
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
@@@ -13829,7 -13697,7 +13830,7 @@@ F:   scripts/nsdep
  NTB AMD DRIVER
  M:    Sanjay R Mehta <[email protected]>
  M:    Shyam Sundar S K <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/ntb/hw/amd/
  
@@@ -13837,7 -13705,7 +13838,7 @@@ NTB DRIVER COR
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
  M:    Allen Hubbe <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -13849,13 -13717,13 +13850,13 @@@ F:        tools/testing/selftests/ntb
  
  NTB IDT DRIVER
  M:    Serge Semin <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/ntb/hw/idt/
  
  NTB INTEL DRIVER
  M:    Dave Jiang <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/davejiang/linux/wiki
  T:    git https://github.com/davejiang/linux.git
@@@ -14009,7 -13877,7 +14010,7 @@@ F:   Documentation/devicetree/bindings/re
  F:    drivers/regulator/pf8x00-regulator.c
  
  NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@@ -14222,7 -14090,7 +14223,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    [email protected]
  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
@@@ -14330,12 -14198,6 +14331,12 @@@ M: Harald Welte <[email protected]
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OG01A1B SENSOR DRIVER
 +M:    Shawn Tu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/og01a1b.c
 +
  OMNIVISION OV02A10 SENSOR DRIVER
  M:    Dongchun Zhu <[email protected]>
  L:    [email protected]
@@@ -14344,13 -14206,6 +14345,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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov08d10.c
 +
  OMNIVISION OV13858 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -14557,7 -14412,6 +14558,7 @@@ F:   scripts/dtc
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  S:    Maintained
  C:    irc://irc.libera.chat/devicetree
@@@ -14747,9 -14601,8 +14748,9 @@@ F:   include/uapi/linux/ppdev.
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
 -M:    Deep Shah <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +R:    Alexey Makhalov <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -14956,7 -14809,6 +14957,7 @@@ F:   drivers/pci/controller/mobiveil/pcie
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <[email protected]>
 +M:    Pali Rohár <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -15296,7 -15148,7 +15297,7 @@@ M:   Ingo Molnar <[email protected]
  M:    Arnaldo Carvalho de Melo <[email protected]>
  R:    Mark Rutland <[email protected]>
  R:    Alexander Shishkin <[email protected]>
 -R:    Jiri Olsa <jolsa@redhat.com>
 +R:    Jiri Olsa <jolsa@kernel.org>
  R:    Namhyung Kim <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15451,7 -15303,7 +15452,7 @@@ F:   drivers/pinctrl/renesas
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -15460,7 -15312,7 +15461,7 @@@ S:   Maintaine
  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
  
@@@ -15679,7 -15531,6 +15680,7 @@@ F:   drivers/net/ppp/pptp.
  
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <[email protected]>
 +M:    Suren Baghdasaryan <[email protected]>
  S:    Maintained
  F:    include/linux/psi*
  F:    kernel/sched/psi.c
@@@ -15715,7 -15566,6 +15716,7 @@@ M:   Iurii Zaikin <[email protected]
  L:    [email protected]
  L:    [email protected]
  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
@@@ -15917,14 -15767,6 +15918,14 @@@ F: sound/soc/codecs/wcd-clsh-v2.
  F:    sound/soc/codecs/wsa881x.c
  F:    sound/soc/qcom/
  
 +QCOM EMBEDDED USB DEBUGGER (EUD)
 +M:    Souradeep Chowdhury <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-eud
 +F:    Documentation/devicetree/bindings/soc/qcom/qcom,eud.yaml
 +F:    drivers/usb/misc/qcom_eud.c
 +
  QCOM IPA DRIVER
  M:    Alex Elder <[email protected]>
  L:    [email protected]
@@@ -16071,20 -15913,18 +16072,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 <[email protected]>
  L:    [email protected]
  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:    [email protected]
 +M:    Toke Høiland-Jørgensen <[email protected]>
  L:    [email protected]
 -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/
@@@ -16159,6 -15999,14 +16160,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 <[email protected]>
 -M:    Mukesh Savaliya <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-qcom-geni.c
 -
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Brian Cain <[email protected]>
  L:    [email protected]
@@@ -16230,8 -16078,8 +16231,8 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
  QUALCOMM RMNET DRIVER
 -M:    Subash Abhinov Kasiviswanathan <[email protected]>
 -M:    Sean Tranchetti <[email protected]>
 +M:    Subash Abhinov Kasiviswanathan <[email protected]>
 +M:    Sean Tranchetti <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
@@@ -16257,10 -16105,11 +16258,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:    [email protected]
  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
@@@ -16362,7 -16211,6 +16363,7 @@@ M:   Jason A. Donenfeld <[email protected]
  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 <[email protected]>
@@@ -16477,8 -16325,6 +16478,8 @@@ F:   tools/testing/selftests/resctrl
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Frederic Weisbecker <[email protected]> (kernel/rcu/tree_nocb.h)
 +M:    Neeraj Upadhyay <[email protected]> (kernel/rcu/tasks.h)
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -16526,10 -16372,10 +16527,10 @@@ F:        drivers/watchdog/realtek_otto_wdt.
  
  REALTEK RTL83xx SMI DSA ROUTER CHIPS
  M:    Linus Walleij <[email protected]>
 +M:    Alvin Šipraga <[email protected]>
  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 <[email protected]>
@@@ -16751,15 -16597,6 +16752,15 @@@ S: Maintaine
  F:    drivers/mtd/nand/raw/r852.c
  F:    drivers/mtd/nand/raw/r852.h
  
 +RISC-V PMU DRIVERS
 +M:    Atish Patra <[email protected]>
 +R:    Anup Patel <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/perf/riscv_pmu.c
 +F:    drivers/perf/riscv_pmu_legacy.c
 +F:    drivers/perf/riscv_pmu_sbi.c
 +
  RISC-V ARCHITECTURE
  M:    Paul Walmsley <[email protected]>
  M:    Palmer Dabbelt <[email protected]>
@@@ -16774,10 -16611,8 +16775,10 @@@ K: risc
  
  RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
  M:    Lewis Hanly <[email protected]>
 +M:    Conor Dooley <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    arch/riscv/boot/dts/microchip/
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/soc/microchip/
  F:    include/soc/microchip/mpfs.h
@@@ -16805,7 -16640,8 +16806,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/rockchip/rockchip_i2s_tdm.*
  
  ROCKCHIP ISP V1 DRIVER
 -M:    Helen Koike <[email protected]>
 -M:    Dafna Hirschfeld <[email protected]>
 +M:    Dafna Hirschfeld <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -16862,7 -16698,7 +16863,7 @@@ M:   Marek Vasut <marek.vasut+renesas@gma
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mfd/bd9571mwv.txt
 +F:    Documentation/devicetree/bindings/mfd/rohm,bd9571mwv.yaml
  F:    drivers/gpio/gpio-bd9571mwv.c
  F:    drivers/mfd/bd9571mwv.c
  F:    drivers/regulator/bd9571mwv-regulator.c
@@@ -17074,7 -16910,9 +17075,7 @@@ L:   [email protected]
  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 <[email protected]>
@@@ -17112,7 -16950,7 +17113,7 @@@ W:   http://www.ibm.com/developerworks/li
  F:    drivers/s390/scsi/zfcp_*
  
  S3C ADC BATTERY DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/power/supply/s3c_adc_battery.c
@@@ -17157,7 -16995,7 +17158,7 @@@ F:   Documentation/admin-guide/LSM/SafeSe
  F:    security/safesetid/
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -17165,7 -17003,7 +17166,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/samsung/
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17200,7 -17038,7 +17201,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17222,11 -17060,11 +17223,11 @@@ M:        Sylwester Nawrocki <sylvester.nawroc
  L:    [email protected]
  L:    [email protected]
  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 <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
@@@ -17248,7 -17086,7 +17249,7 @@@ S:   Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Vladimir Zapolskiy <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17262,7 -17100,7 +17263,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  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 <[email protected]>
@@@ -17283,12 -17121,12 +17284,12 @@@ F:        include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Andi Shyti <[email protected]>
  L:    [email protected]
  L:    [email protected]
  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
@@@ -17300,12 -17138,11 +17301,12 @@@ S:        Supporte
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -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
@@@ -17697,7 -17534,7 +17698,7 @@@ F:   include/media/i2c/rj54n1cb0c.
  SH_VOU V4L2 OUTPUT DRIVER
  L:    [email protected]
  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
@@@ -17928,10 -17765,8 +17929,10 @@@ M: David Rientjes <[email protected]
  M:    Joonsoo Kim <[email protected]>
  M:    Andrew Morton <[email protected]>
  M:    Vlastimil Babka <[email protected]>
 +R:    Roman Gushchin <[email protected]>
  L:    [email protected]
  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*
  
@@@ -18469,8 -18304,7 +18470,8 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/imu/st_lsm6dsx/
  
  ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
 -M:    Mickael Guene <[email protected]>
 +M:    Benjamin Mugnier <[email protected]>
 +M:    Sylvain Petinot <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -18709,13 -18543,6 +18710,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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
 +F:    drivers/spi/spi-sunplus-sp7021.c
 +
  SUPERH
  M:    Yoshinori Sato <[email protected]>
  M:    Rich Felker <[email protected]>
@@@ -18885,7 -18712,6 +18886,7 @@@ SYNOPSYS DESIGNWARE I2C DRIVE
  M:    Jarkko Nikula <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  R:    Mika Westerberg <[email protected]>
 +R:    Jan Dabros <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-designware-*
@@@ -19268,7 -19094,6 +19269,7 @@@ TEXAS INSTRUMENTS ASoC DRIVER
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
  F:    sound/soc/ti/
  
  TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
@@@ -19449,7 -19274,7 +19450,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 <[email protected]>
@@@ -19508,7 -19333,7 +19509,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
@@@ -19594,8 -19419,7 +19595,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:    [email protected]
@@@ -19666,15 -19490,6 +19667,15 @@@ S: Maintaine
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
 +TMP464 HARDWARE MONITOR DRIVER
 +M:    Agathe Porte <[email protected]>
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -19914,11 -19729,6 +19915,11 @@@ W: http://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/pci/tw686x/
  
 +U-BOOT ENVIRONMENT VARIABLES
 +M:    Rafał Miłecki <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
 +
  UACCE ACCELERATOR FRAMEWORK
  M:    Zhangfei Gao <[email protected]>
  M:    Zhou Wang <[email protected]>
@@@ -20021,7 -19831,6 +20022,7 @@@ R:   Alim Akhtar <[email protected]
  R:    Avri Altman <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/ufs/
  F:    Documentation/scsi/ufs.rst
  F:    drivers/scsi/ufs/
  
@@@ -20496,13 -20305,6 +20497,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/vfio/fsl-mc/
  
 +VFIO HISILICON PCI DRIVER
 +M:    Longfang Liu <[email protected]>
 +M:    Shameer Kolothum <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vfio/pci/hisilicon/
 +
  VFIO MEDIATED DEVICE DRIVERS
  M:    Kirti Wankhede <[email protected]>
  L:    [email protected]
@@@ -20512,28 -20314,12 +20513,28 @@@ F:        drivers/vfio/mdev
  F:    include/linux/mdev.h
  F:    samples/vfio-mdev/
  
 +VFIO PCI DEVICE SPECIFIC DRIVERS
 +R:    Jason Gunthorpe <[email protected]>
 +R:    Yishai Hadas <[email protected]>
 +R:    Shameer Kolothum <[email protected]>
 +R:    Kevin Tian <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +P:    Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst
 +F:    drivers/vfio/pci/*/
 +
  VFIO PLATFORM DRIVER
  M:    Eric Auger <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/vfio/platform/
  
 +VFIO MLX5 PCI DRIVER
 +M:    Yishai Hadas <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vfio/pci/mlx5/
 +
  VGA_SWITCHEROO
  R:    Lukas Wunner <[email protected]>
  S:    Maintained
@@@ -20597,8 -20383,8 +20598,8 @@@ F:   drivers/media/common/videobuf2/
  F:    include/media/videobuf2-*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 -M:    Helen Koike <[email protected]>
 -R:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
 +R:    Kieran Bingham <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
@@@ -20853,33 -20639,30 +20854,33 @@@ F:        tools/testing/vsock
  
  VMWARE BALLOON DRIVER
  M:    Nadav Amit <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
 -M:    Deep Shah <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +M:    Alexey Makhalov <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  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 <[email protected]>
  M:    Vishnu Dasa <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/infiniband/hw/vmw_pvrdma/
  
  VMware PVSCSI driver
  M:    Vishal Bhakta <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/vmw_pvscsi.c
@@@ -20887,7 -20670,7 +20888,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
  M:    Vivek Thampi <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/ptp/ptp_vmw.c
@@@ -20895,15 -20678,14 +20896,15 @@@
  VMWARE VMCI DRIVER
  M:    Jorgen Hansen <[email protected]>
  M:    Vishnu Dasa <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -L:    [email protected] (private)
  S:    Maintained
  F:    drivers/misc/vmw_vmci/
  
  VMWARE VMMOUSE SUBDRIVER
 -M:    "VMware Graphics" <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Zack Rusin <[email protected]>
 +R:    VMware Graphics Reviewers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/input/mouse/vmmouse.c
@@@ -20911,7 -20693,7 +20912,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <[email protected]>
 -M:    [email protected]
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -21287,7 -21069,7 +21288,7 @@@ L:   [email protected]
  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 <[email protected]>
@@@ -21507,11 -21289,6 +21508,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 <[email protected]>
 +S:    Maintained
 +F:    drivers/crypto/xilinx/zynqmp-sha.c
 +
  XILINX EVENT MANAGEMENT DRIVER
  M:    Abhyuday Godhasara <[email protected]>
  S:    Maintained
@@@ -21529,6 -21306,7 +21530,6 @@@ M:   George Cherian <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.marvell.com
 -F:    Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt
  F:    drivers/i2c/busses/i2c-xlp9xx.c
  
  XRA1403 GPIO EXPANDER
@@@ -21691,6 -21469,7 +21692,6 @@@ THE RES
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]
  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 mm/memblock.c
index b12a364f2766fdf3cd3b2018aaf9d851b8536073,11561bbff8f5f06570f10da45e8ac28cfe173b00..e4f03a6e8e56e751a807df41bff38e9aabc83ce2
--- 1/mm/memblock.c
--- 2/mm/memblock.c
+++ b/mm/memblock.c
@@@ -366,20 -366,14 +366,20 @@@ void __init memblock_discard(void
                addr = __pa(memblock.reserved.regions);
                size = PAGE_ALIGN(sizeof(struct memblock_region) *
                                  memblock.reserved.max);
 -              memblock_free_late(addr, size);
 +              if (memblock_reserved_in_slab)
 +                      kfree(memblock.reserved.regions);
 +              else
 +                      memblock_free_late(addr, size);
        }
  
        if (memblock.memory.regions != memblock_memory_init_regions) {
                addr = __pa(memblock.memory.regions);
                size = PAGE_ALIGN(sizeof(struct memblock_region) *
                                  memblock.memory.max);
 -              memblock_free_late(addr, size);
 +              if (memblock_memory_in_slab)
 +                      kfree(memblock.memory.regions);
 +              else
 +                      memblock_free_late(addr, size);
        }
  
        memblock_memory = NULL;
@@@ -1284,11 -1278,10 +1284,10 @@@ __next_mem_pfn_range_in_zone(u64 *idx, 
  {
        int zone_nid = zone_to_nid(zone);
        phys_addr_t spa, epa;
-       int nid;
  
        __next_mem_range(idx, zone_nid, MEMBLOCK_NONE,
                         &memblock.memory, &memblock.reserved,
-                        &spa, &epa, &nid);
+                        &spa, &epa, NULL);
  
        while (*idx != U64_MAX) {
                unsigned long epfn = PFN_DOWN(epa);
@@@ -1315,7 -1308,7 +1314,7 @@@
  
                __next_mem_range(idx, zone_nid, MEMBLOCK_NONE,
                                 &memblock.memory, &memblock.reserved,
-                                &spa, &epa, &nid);
+                                &spa, &epa, NULL);
        }
  
        /* signal end of iteration */

diff --combined tools/include/linux/types.h
index 6c18c54e7d7faf7a17541f7e9b5b61ba3b3cb69d,5908e58c35981fb13b870d5fe798a097ffb44cbd..051fdeaf267073d669e3732488406693a004cfe2
--- 1/tools/include/linux/types.h
--- 2/tools/include/linux/types.h
+++ b/tools/include/linux/types.h
@@@ -43,10 -43,11 +43,10 @@@ typedef __u8  u8
  typedef __s8  s8;
  
  #ifdef __CHECKER__
 -#define __bitwise__ __attribute__((bitwise))
 +#define __bitwise     __attribute__((bitwise))
  #else
 -#define __bitwise__
 +#define __bitwise
  #endif
 -#define __bitwise __bitwise__
  
  #define __force
  #define __user
@@@ -63,10 -64,20 +63,20 @@@ typedef __u64 __bitwise __be64
  typedef __u16 __bitwise __sum16;
  typedef __u32 __bitwise __wsum;
  
+ #ifdef CONFIG_PHYS_ADDR_T_64BIT
+ typedef u64 phys_addr_t;
+ #else
+ typedef u32 phys_addr_t;
+ #endif
+ 
  typedef struct {
        int counter;
  } atomic_t;
  
+ typedef struct {
+       long counter;
+ } atomic_long_t;
+ 
  #ifndef __aligned_u64
  # define __aligned_u64 __u64 __attribute__((aligned(8)))
  #endif