Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub...
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 17 Aug 2022 19:30:00 +0000 (12:30 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 17 Aug 2022 19:30:00 +0000 (12:30 -0700)
Sync up with the latest I2C code base to get updated prototype of I2C
bus remove() method.

1  2 
MAINTAINERS
drivers/input/keyboard/applespi.c

diff --combined MAINTAINERS
index 5cff72980872cf1ea82674c99f4c78f91afb3b9f,8a5012ba6ff98ac6f4a1415b3fce51423329c2d2..2910c5e50ac02365366d5504d6dd0fd3e1795f62
@@@ -171,7 -171,6 +171,6 @@@ F: drivers/scsi/53c700
  
  6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
  M:    Alexander Aring <alex.aring@gmail.com>
- M:    Jukka Rissanen <jukka.rissanen@linux.intel.com>
  L:    linux-bluetooth@vger.kernel.org
  L:    linux-wpan@vger.kernel.org
  S:    Maintained
@@@ -242,6 -241,11 +241,11 @@@ F:       include/trace/events/9p.
  F:    include/uapi/linux/virtio_9p.h
  F:    net/9p/
  
+ A64FX DIAG DRIVER
+ M:    Hitomi Hasegawa <hasegawa-hitomi@fujitsu.com>
+ S:    Supported
+ F:    drivers/soc/fujitsu/a64fx-diag.c
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -260,6 -264,11 +264,11 @@@ W:       http://www.adaptec.com
  F:    Documentation/scsi/aacraid.rst
  F:    drivers/scsi/aacraid/
  
+ AB8500 BATTERY AND CHARGER DRIVERS
+ M:    Linus Walleij <linus.walleij@linaro.org>
+ F:    Documentation/devicetree/bindings/power/supply/*ab8500*
+ F:    drivers/power/supply/*ab8500*
  ABI/API
  L:    linux-api@vger.kernel.org
  F:    include/linux/syscalls.h
@@@ -280,38 -289,37 +289,37 @@@ S:      Maintaine
  F:    drivers/hwmon/abituguru3.c
  
  ACCES 104-DIO-48E GPIO DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-104-dio-48e.c
  
  ACCES 104-IDI-48 GPIO DRIVER
- M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-104-idi-48.c
  
  ACCES 104-IDIO-16 GPIO DRIVER
- M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-104-idio-16.c
  
  ACCES 104-QUAD-8 DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
- M:    Syed Nayyar Waris <syednwaris@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
  F:    drivers/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-pci-idio-16.c
  
  ACCES PCIe-IDIO-24 GPIO DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-pcie-idio-24.c
@@@ -426,7 -434,6 +434,6 @@@ F: drivers/acpi/*thermal
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <jean-philippe@linaro.org>
  L:    linux-acpi@vger.kernel.org
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  S:    Maintained
  F:    drivers/acpi/viot.c
@@@ -734,6 -741,14 +741,14 @@@ S:       Maintaine
  F:    Documentation/i2c/busses/i2c-ali1563.rst
  F:    drivers/i2c/busses/i2c-ali1563.c
  
+ ALIBABA ELASTIC RDMA DRIVER
+ M:    Cheng Xu <chengyou@linux.alibaba.com>
+ M:    Kai Shen <kaishen@linux.alibaba.com>
+ L:    linux-rdma@vger.kernel.org
+ S:    Supported
+ F:    drivers/infiniband/hw/erdma
+ F:    include/uapi/rdma/erdma-abi.h
  ALIENWARE WMI DRIVER
  L:    Dell.Client.Kernel@dell.com
  S:    Maintained
@@@ -763,6 -778,14 +778,14 @@@ T:       git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
  F:    drivers/media/platform/sunxi/sun4i-csi/
  
+ ALLWINNER A31 MIPI CSI-2 BRIDGE DRIVER
+ M:    Paul Kocialkowski <paul.kocialkowski@bootlin.com>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ T:    git git://linuxtv.org/media_tree.git
+ F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml
+ F:    drivers/media/platform/sunxi/sun6i-mipi-csi2/
  ALLWINNER CPUFREQ DRIVER
  M:    Yangtao Li <tiny.windzz@gmail.com>
  L:    linux-pm@vger.kernel.org
@@@ -798,7 -821,7 +821,7 @@@ S: Maintaine
  F:    drivers/staging/media/sunxi/cedrus/
  
  ALPHA PORT
- M:    Richard Henderson <rth@twiddle.net>
+ M:    Richard Henderson <richard.henderson@linaro.org>
  M:    Ivan Kokshaysky <ink@jurassic.park.msu.ru>
  M:    Matt Turner <mattst88@gmail.com>
  L:    linux-alpha@vger.kernel.org
@@@ -960,7 -983,6 +983,6 @@@ F: drivers/video/fbdev/geode
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <joro@8bytes.org>
  R:    Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -998,7 -1020,7 +1020,7 @@@ AMD PMC DRIVE
  M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
- F:    drivers/platform/x86/amd-pmc.*
+ F:    drivers/platform/x86/amd/pmc.c
  
  AMD HSMP DRIVER
  M:    Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
@@@ -1008,7 -1030,7 +1030,7 @@@ S:      Maintaine
  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
+ F:    drivers/platform/x86/amd/hsmp.c
  
  AMD POWERPLAY AND SWSMU
  M:    Evan Quan <evan.quan@amd.com>
@@@ -1040,6 -1062,7 +1062,7 @@@ F:      arch/arm64/boot/dts/amd
  
  AMD XGBE DRIVER
  M:    Tom Lendacky <thomas.lendacky@amd.com>
+ M:    "Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
@@@ -1329,7 -1352,7 +1352,7 @@@ M:      Todd Kjos <tkjos@android.com
  M:    Martijn Coenen <maco@android.com>
  M:    Joel Fernandes <joel@joelfernandes.org>
  M:    Christian Brauner <christian@brauner.io>
- M:    Hridya Valsaraju <hridya@google.com>
+ M:    Carlos Llamas <cmllamas@google.com>
  M:    Suren Baghdasaryan <surenb@google.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
@@@ -1356,7 -1379,7 +1379,7 @@@ S:      Maintaine
  F:    sound/aoa/
  
  APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
  F:    drivers/iio/adc/stx104.c
@@@ -1372,10 -1395,14 +1395,14 @@@ F:   include/uapi/linux/apm_bios.
  
  APPARMOR SECURITY MODULE
  M:    John Johansen <john.johansen@canonical.com>
- L:    apparmor@lists.ubuntu.com (subscribers-only, general discussion)
+ M:    John Johansen <john@apparmor.net>
+ L:    apparmor@lists.ubuntu.com (moderated for non-subscribers)
  S:    Supported
- W:    wiki.apparmor.net
+ W:    apparmor.net
+ B:    https://gitlab.com/apparmor/apparmor-kernel
+ C:    irc://irc.oftc.net/apparmor
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
+ T:    https://gitlab.com/apparmor/apparmor-kernel.git
  F:    Documentation/admin-guide/LSM/apparmor.rst
  F:    security/apparmor/
  
@@@ -1470,6 -1497,13 +1497,13 @@@ S:    Supporte
  W:    http://www.aquantia.com
  F:    drivers/net/ethernet/aquantia/atlantic/aq_ptp*
  
+ AR0521 ON SEMICONDUCTOR CAMERA SENSOR DRIVER
+ M:    Krzysztof Hałasa <khalasa@piap.pl>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/media/i2c/onnn,ar0521.yaml
+ F:    drivers/media/i2c/ar0521.c
  ARASAN NAND CONTROLLER DRIVER
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  M:    Naga Sureshkumar Relli <nagasure@xilinx.com>
@@@ -1522,7 -1556,7 +1556,7 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
  F:    Documentation/devicetree/bindings/auxdisplay/arm,versatile-lcd.yaml
  F:    Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
- F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
+ F:    Documentation/devicetree/bindings/i2c/arm,i2c-versatile.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
  F:    Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
  F:    arch/arm/boot/dts/arm-realview-*
@@@ -1825,6 -1859,7 +1859,7 @@@ ARM/APPLE MACHINE SUPPOR
  M:    Hector Martin <marcan@marcan.st>
  M:    Sven Peter <sven@svenpeter.dev>
  R:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
+ L:    asahi@lists.linux.dev
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    https://asahilinux.org
@@@ -1834,6 -1869,7 +1869,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/clock/apple,nco.yaml
+ F:    Documentation/devicetree/bindings/dma/apple,admac.yaml
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
  F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
@@@ -1847,6 -1883,7 +1883,7 @@@ F:      Documentation/devicetree/bindings/po
  F:    Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
  F:    arch/arm64/boot/dts/apple/
  F:    drivers/clk/clk-apple-nco.c
+ F:    drivers/dma/apple-admac.c
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
@@@ -1895,6 -1932,7 +1932,7 @@@ L:      linux-aspeed@lists.ozlabs.org (moder
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
+ F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed-*
  F:    arch/arm/mach-aspeed/
  N:    aspeed
@@@ -1983,11 -2021,9 +2021,9 @@@ L:     linux-arm-kernel@lists.infradead.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
- F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
- F:    Documentation/devicetree/bindings/arm/coresight-cti.yaml
- F:    Documentation/devicetree/bindings/arm/coresight.txt
- F:    Documentation/devicetree/bindings/arm/ete.yaml
- F:    Documentation/devicetree/bindings/arm/trbe.yaml
+ F:    Documentation/devicetree/bindings/arm/arm,coresight-*.yaml
+ F:    Documentation/devicetree/bindings/arm/arm,embedded-trace-extension.yaml
+ F:    Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml
  F:    Documentation/trace/coresight/*
  F:    drivers/hwtracing/coresight/*
  F:    include/dt-bindings/arm/coresight-cti-dt.h
@@@ -2142,11 -2178,13 +2178,13 @@@ M:   Jean-Marie Verdun <verdun@hpe.com
  M:    Nick Hawkins <nick.hawkins@hpe.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
+ F:    Documentation/devicetree/bindings/spi/hpe,gxp-spi.yaml
  F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
  F:    arch/arm/boot/dts/hpe-bmc*
  F:    arch/arm/boot/dts/hpe-gxp*
  F:    arch/arm/mach-hpe/
  F:    drivers/clocksource/timer-gxp.c
+ F:    drivers/spi/spi-gxp.c
  F:    drivers/watchdog/gxp-wdt.c
  
  ARM/IGEP MACHINE SUPPORT
@@@ -2418,7 -2456,7 +2456,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/arm/ste-*
  F:    Documentation/devicetree/bindings/arm/ux500.yaml
  F:    Documentation/devicetree/bindings/arm/ux500/
- F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
+ F:    Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml
  F:    arch/arm/boot/dts/ste-*
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/mach-ux500/
@@@ -2448,11 -2486,15 +2486,15 @@@ S:   Supporte
  F:    Documentation/devicetree/bindings/*/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*npcm*
  F:    Documentation/devicetree/bindings/arm/npcm/*
+ F:    Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    arch/arm/mach-npcm/
+ F:    arch/arm64/boot/dts/nuvoton/
  F:    drivers/*/*npcm*
  F:    drivers/*/*/*npcm*
+ F:    drivers/rtc/rtc-nct3018y.c
  F:    include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
+ F:    include/dt-bindings/clock/nuvoton,npcm845-clk.h
  
  ARM/NUVOTON WPCM450 ARCHITECTURE
  M:    Jonathan Neuschäfer <j.neuschaefer@gmx.net>
@@@ -2499,10 -2541,8 +2541,8 @@@ F:     drivers/power/reset/oxnas-restart.
  N:    oxnas
  
  ARM/PALM TREO SUPPORT
- M:    Tomas Cech <sleep_walker@suse.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Maintained
- W:    http://hackndev.com
+ S:    Orphan
  F:    arch/arm/mach-pxa/palmtreo.*
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
@@@ -2540,6 -2580,7 +2580,7 @@@ W:      http://www.armlinux.org.uk
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <agross@kernel.org>
  M:    Bjorn Andersson <bjorn.andersson@linaro.org>
+ R:    Konrad Dybcio <konrad.dybcio@somainline.org>
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -2590,7 -2631,7 +2631,7 @@@ L:      linux-unisoc@lists.infradead.org (mo
  S:    Maintained
  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/interrupt-controller/rda,8810pl-intc.yaml
  F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
  F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
  F:    arch/arm/boot/dts/rda8810pl-*
@@@ -2618,6 -2659,8 +2659,8 @@@ Q:      http://patchwork.kernel.org/project/
  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:    Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
+ F:    Documentation/devicetree/bindings/soc/renesas/
  F:    arch/arm64/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
@@@ -2668,6 -2711,7 +2711,7 @@@ B:      mailto:linux-samsung-soc@vger.kernel
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
+ F:    Documentation/devicetree/bindings/hwinfo/samsung,*
  F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
  F:    Documentation/devicetree/bindings/soc/samsung/
  F:    arch/arm/boot/dts/exynos*
@@@ -2717,6 -2761,7 +2761,7 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
+ F:    Documentation/devicetree/bindings/media/samsung,s5pv210-jpeg.yaml
  F:    drivers/media/platform/samsung/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
@@@ -2736,6 -2781,7 +2781,7 @@@ Q:      http://patchwork.kernel.org/project/
  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:    Documentation/devicetree/bindings/soc/renesas/
  F:    arch/arm/boot/dts/emev2*
  F:    arch/arm/boot/dts/gr-peach*
  F:    arch/arm/boot/dts/iwg20d-q7*
@@@ -2825,6 -2871,23 +2871,23 @@@ F:    drivers/clocksource/armv7m_systick.
  N:    stm32
  N:    stm
  
+ ARM/SUNPLUS SP7021 SOC SUPPORT
+ M:    Qin Jian <qinjian@cqplus1.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for mon-subscribers)
+ S:    Maintained
+ W:    https://sunplus-tibbo.atlassian.net/wiki/spaces/doc/overview
+ F:    Documentation/devicetree/bindings/arm/sunplus,sp7021.yaml
+ F:    Documentation/devicetree/bindings/clock/sunplus,sp7021-clkc.yaml
+ F:    Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.yaml
+ F:    Documentation/devicetree/bindings/reset/sunplus,reset.yaml
+ F:    arch/arm/boot/dts/sunplus-sp7021*.dts*
+ F:    arch/arm/configs/sp7021_*defconfig
+ F:    arch/arm/mach-sunplus/
+ F:    drivers/irqchip/irq-sp7021-intc.c
+ F:    drivers/reset/reset-sunplus.c
+ F:    include/dt-bindings/clock/sunplus,sp7021-clkc.h
+ F:    include/dt-bindings/reset/sunplus,sp7021-reset.h
  ARM/Synaptics SoC support
  M:    Jisheng Zhang <jszhang@kernel.org>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -2901,6 -2964,7 +2964,7 @@@ M:      Tero Kristo <kristo@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/arm/ti/k3.yaml
+ F:    Documentation/devicetree/bindings/hwinfo/ti,k3-socinfo.yaml
  F:    arch/arm64/boot/dts/ti/Makefile
  F:    arch/arm64/boot/dts/ti/k3-*
  F:    include/dt-bindings/pinctrl/k3.h
@@@ -3139,6 -3203,13 +3203,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/media/aspeed-video.txt
  F:    drivers/media/platform/aspeed/
  
+ ASPEED USB UDC DRIVER
+ M:    Neal Liu <neal_liu@aspeedtech.com>
+ L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
+ F:    drivers/usb/gadget/udc/aspeed_udc.c
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <corentin.chary@gmail.com>
  L:    acpi4asus-user@lists.sourceforge.net
@@@ -3441,7 -3512,7 +3512,7 @@@ W:      https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/broadcom/b43legacy/
  
  BACKLIGHT CLASS/SUBSYSTEM
- M:    Lee Jones <lee.jones@linaro.org>
+ M:    Lee Jones <lee@kernel.org>
  M:    Daniel Thompson <daniel.thompson@linaro.org>
  M:    Jingoo Han <jingoohan1@gmail.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -3543,7 -3614,6 +3614,6 @@@ F:      lib/bitmap.
  F:    lib/cpumask.c
  F:    lib/find_bit.c
  F:    lib/find_bit_benchmark.c
- F:    lib/nodemask.c
  F:    lib/test_bitmap.c
  F:    tools/include/linux/bitmap.h
  F:    tools/include/linux/find.h
@@@ -3617,16 -3687,18 +3687,18 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
  F:    drivers/iio/accel/bma400*
  
- BPF (Safe dynamic programs and tools)
+ BPF [GENERAL] (Safe Dynamic Programs and Tools)
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Andrii Nakryiko <andrii@kernel.org>
- R:    Martin KaFai Lau <kafai@fb.com>
- R:    Song Liu <songliubraving@fb.com>
+ R:    Martin KaFai Lau <martin.lau@linux.dev>
+ R:    Song Liu <song@kernel.org>
  R:    Yonghong Song <yhs@fb.com>
  R:    John Fastabend <john.fastabend@gmail.com>
  R:    KP Singh <kpsingh@kernel.org>
- L:    netdev@vger.kernel.org
+ R:    Stanislav Fomichev <sdf@google.com>
+ R:    Hao Luo <haoluo@google.com>
+ R:    Jiri Olsa <jolsa@kernel.org>
  L:    bpf@vger.kernel.org
  S:    Supported
  W:    https://bpf.io/
@@@ -3658,12 -3730,9 +3730,9 @@@ F:     scripts/pahole-version.s
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
- N:    bpf
- K:    bpf
  
  BPF JIT for ARM
  M:    Shubham Bansal <illusionist.neo@gmail.com>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Odd Fixes
  F:    arch/arm/net/
@@@ -3672,7 -3741,6 +3741,6 @@@ BPF JIT for ARM6
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Zi Shen Lim <zlim.lnx@gmail.com>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
  F:    arch/arm64/net/
  BPF JIT for MIPS (32-BIT AND 64-BIT)
  M:    Johan Almbladh <johan.almbladh@anyfinetworks.com>
  M:    Paul Burton <paulburton@kernel.org>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
  M:    Jakub Kicinski <kuba@kernel.org>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Odd Fixes
  F:    drivers/net/ethernet/netronome/nfp/bpf/
  BPF JIT for POWERPC (32-BIT AND 64-BIT)
  M:    Naveen N. Rao <naveen.n.rao@linux.ibm.com>
  M:    Michael Ellerman <mpe@ellerman.id.au>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
  F:    arch/powerpc/net/
  BPF JIT for RISC-V (32-bit)
  M:    Luke Nelson <luke.r.nels@gmail.com>
  M:    Xi Wang <xi.wang@gmail.com>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3711,7 -3775,6 +3775,6 @@@ X:      arch/riscv/net/bpf_jit_comp64.
  
  BPF JIT for RISC-V (64-bit)
  M:    Björn Töpel <bjorn@kernel.org>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3721,7 -3784,6 +3784,6 @@@ BPF JIT for S39
  M:    Ilya Leoshkevich <iii@linux.ibm.com>
  M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <gor@linux.ibm.com>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
  F:    arch/s390/net/
@@@ -3729,14 -3791,12 +3791,12 @@@ X:   arch/s390/net/pnet.
  
  BPF JIT for SPARC (32-BIT AND 64-BIT)
  M:    David S. Miller <davem@davemloft.net>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Odd Fixes
  F:    arch/sparc/net/
  
  BPF JIT for X86 32-BIT
  M:    Wang YanQing <udknight@gmail.com>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Odd Fixes
  F:    arch/x86/net/bpf_jit_comp32.c
  BPF JIT for X86 64-BIT
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Daniel Borkmann <daniel@iogearbox.net>
- L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
  F:    arch/x86/net/
  X:    arch/x86/net/bpf_jit_comp32.c
  
- BPF LSM (Security Audit and Enforcement using BPF)
+ BPF [CORE]
+ M:    Alexei Starovoitov <ast@kernel.org>
+ M:    Daniel Borkmann <daniel@iogearbox.net>
+ R:    John Fastabend <john.fastabend@gmail.com>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    kernel/bpf/verifier.c
+ F:    kernel/bpf/tnum.c
+ F:    kernel/bpf/core.c
+ F:    kernel/bpf/syscall.c
+ F:    kernel/bpf/dispatcher.c
+ F:    kernel/bpf/trampoline.c
+ F:    include/linux/bpf*
+ F:    include/linux/filter.h
+ BPF [BTF]
+ M:    Martin KaFai Lau <martin.lau@linux.dev>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    kernel/bpf/btf.c
+ F:    include/linux/btf*
+ BPF [TRACING]
+ M:    Song Liu <song@kernel.org>
+ R:    Jiri Olsa <jolsa@kernel.org>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    kernel/trace/bpf_trace.c
+ F:    kernel/bpf/stackmap.c
+ BPF [NETWORKING] (tc BPF, sock_addr)
+ M:    Martin KaFai Lau <martin.lau@linux.dev>
+ M:    Daniel Borkmann <daniel@iogearbox.net>
+ R:    John Fastabend <john.fastabend@gmail.com>
+ L:    bpf@vger.kernel.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    net/core/filter.c
+ F:    net/sched/act_bpf.c
+ F:    net/sched/cls_bpf.c
+ BPF [NETWORKING] (struct_ops, reuseport)
+ M:    Martin KaFai Lau <martin.lau@linux.dev>
+ L:    bpf@vger.kernel.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    kernel/bpf/bpf_struct*
+ BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
  M:    KP Singh <kpsingh@kernel.org>
  R:    Florent Revest <revest@chromium.org>
  R:    Brendan Jackman <jackmanb@chromium.org>
@@@ -3761,7 -3868,27 +3868,27 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
- BPF L7 FRAMEWORK
+ BPF [STORAGE & CGROUPS]
+ M:    Martin KaFai Lau <martin.lau@linux.dev>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    kernel/bpf/cgroup.c
+ F:    kernel/bpf/*storage.c
+ F:    kernel/bpf/bpf_lru*
+ BPF [RINGBUF]
+ M:    Andrii Nakryiko <andrii@kernel.org>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    kernel/bpf/ringbuf.c
+ BPF [ITERATOR]
+ M:    Yonghong Song <yhs@fb.com>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    kernel/bpf/*iter.c
+ BPF [L7 FRAMEWORK] (sockmap)
  M:    John Fastabend <john.fastabend@gmail.com>
  M:    Jakub Sitnicki <jakub@cloudflare.com>
  L:    netdev@vger.kernel.org
@@@ -3774,13 -3901,31 +3901,31 @@@ F:   net/ipv4/tcp_bpf.
  F:    net/ipv4/udp_bpf.c
  F:    net/unix/unix_bpf.c
  
- BPFTOOL
+ BPF [LIBRARY] (libbpf)
+ M:    Andrii Nakryiko <andrii@kernel.org>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    tools/lib/bpf/
+ BPF [TOOLING] (bpftool)
  M:    Quentin Monnet <quentin@isovalent.com>
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    kernel/bpf/disasm.*
  F:    tools/bpf/bpftool/
  
+ BPF [SELFTESTS] (Test Runners & Infrastructure)
+ M:    Andrii Nakryiko <andrii@kernel.org>
+ R:    Mykola Lysenko <mykolal@fb.com>
+ L:    bpf@vger.kernel.org
+ S:    Maintained
+ F:    tools/testing/selftests/bpf/
+ BPF [MISC]
+ L:    bpf@vger.kernel.org
+ S:    Odd Fixes
+ K:    (?:\b|_)bpf(?:\b|_)
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <michael.chan@broadcom.com>
  L:    netdev@vger.kernel.org
@@@ -3802,15 -3947,28 +3947,28 @@@ BROADCOM BCMBCA ARM ARCHITECTUR
  M:    William Zhang <william.zhang@broadcom.com>
  M:    Anand Gore <anand.gore@broadcom.com>
  M:    Kursad Oney <kursad.oney@broadcom.com>
+ M:    Florian Fainelli <f.fainelli@gmail.com>
  R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
  F:    Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
- F:    arch/arm/boot/dts/bcm47622.dtsi
- F:    arch/arm/boot/dts/bcm947622.dts
+ F:    arch/arm64/boot/dts/broadcom/bcmbca/*
  N:    bcmbca
  N:    bcm[9]?47622
+ N:    bcm[9]?4912
+ N:    bcm[9]?63138
+ N:    bcm[9]?63146
+ N:    bcm[9]?63148
+ N:    bcm[9]?63158
+ N:    bcm[9]?63178
+ N:    bcm[9]?6756
+ N:    bcm[9]?6813
+ N:    bcm[9]?6846
+ N:    bcm[9]?6855
+ N:    bcm[9]?6856
+ N:    bcm[9]?6858
+ N:    bcm[9]?6878
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
@@@ -3886,14 -4044,6 +4044,6 @@@ S:     Maintaine
  F:    arch/arm/boot/dts/bcm47189*
  F:    arch/arm/boot/dts/bcm53573*
  
- BROADCOM BCM63XX ARM ARCHITECTURE
- M:    Florian Fainelli <f.fainelli@gmail.com>
- R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
- L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Maintained
- T:    git git://github.com/broadcom/stblinux.git
- N:    bcm63xx
  BROADCOM BCM63XX/BCM33XX UDC DRIVER
  M:    Kevin Cernekee <cernekee@gmail.com>
  L:    linux-usb@vger.kernel.org
@@@ -4300,7 -4450,7 +4450,7 @@@ L:      linux-pm@vger.kernel.or
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
- F:    Documentation/devicetree/bindings/devfreq/exynos-bus.txt
+ F:    Documentation/devicetree/bindings/interconnect/samsung,exynos-bus.yaml
  F:    drivers/devfreq/exynos-bus.c
  
  BUSLOGIC SCSI DRIVER
@@@ -4644,7 -4794,6 +4794,6 @@@ L:      keyrings@vger.kernel.or
  S:    Maintained
  F:    Documentation/admin-guide/module-signing.rst
  F:    certs/
- F:    scripts/check-blacklist-hashes.awk
  F:    scripts/sign-file.c
  F:    tools/certs/
  
@@@ -4772,6 -4921,7 +4921,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
  F:    include/dt-bindings/sound/cs*
  F:    sound/pci/hda/cs*
+ F:    sound/pci/hda/hda_cs_dsp_ctl.*
  F:    sound/soc/codecs/cs*
  
  CIRRUS LOGIC DSP FIRMWARE DRIVER
@@@ -4890,7 -5040,7 +5040,7 @@@ R:      Nick Desaulniers <ndesaulniers@googl
  L:    llvm@lists.linux.dev
  S:    Supported
  B:    https://github.com/ClangBuiltLinux/linux/issues
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/clang/features
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    include/linux/cfi.h
  F:    kernel/cfi.c
  
@@@ -4982,12 -5132,15 +5132,15 @@@ F:   include/linux/clk
  F:    include/linux/of_clk.h
  X:    drivers/clk/clkdev.c
  
- COMMON INTERNET FILE SYSTEM CLIENT (CIFS)
+ COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)
  M:    Steve French <sfrench@samba.org>
+ R:    Paulo Alcantara <pc@cjr.nz> (DFS, global name space)
+ R:    Ronnie Sahlberg <lsahlber@redhat.com> (directory leases, sparse files)
+ R:    Shyam Prasad N <sprasad@microsoft.com> (multichannel)
  L:    linux-cifs@vger.kernel.org
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  S:    Supported
- W:    http://linux-cifs.samba.org/
+ W:    https://wiki.samba.org/index.php/LinuxCIFS
  T:    git git://git.samba.org/sfrench/cifs-2.6.git
  F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
@@@ -5027,7 -5180,7 +5180,7 @@@ COMPUTE EXPRESS LINK (CXL
  M:    Alison Schofield <alison.schofield@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Ira Weiny <ira.weiny@intel.com>
- M:    Ben Widawsky <ben.widawsky@intel.com>
+ M:    Ben Widawsky <bwidawsk@kernel.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-cxl@vger.kernel.org
  S:    Maintained
@@@ -5057,6 -5210,7 +5210,7 @@@ F:      include/linux/console
  
  CONTEXT TRACKING
  M:    Frederic Weisbecker <frederic@kernel.org>
+ M:    "Paul E. McKenney" <paulmck@kernel.org>
  S:    Maintained
  F:    kernel/context_tracking.c
  F:    include/linux/context_tracking*
@@@ -5132,10 -5286,10 +5286,10 @@@ F:   Documentation/hwmon/corsair-psu.rs
  F:    drivers/hwmon/corsair-psu.c
  
  COUNTER SUBSYSTEM
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
- T:    git git@gitlab.com:vilhelmgray/counter.git
+ T:    git https://git.linaro.org/people/william.gray/counter.git
  F:    Documentation/ABI/testing/sysfs-bus-counter
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
@@@ -5379,7 -5533,7 +5533,7 @@@ W:      http://www.chelsio.co
  F:    drivers/net/ethernet/chelsio/cxgb3/
  
  CXGB3 ISCSI DRIVER (CXGB3I)
- M:    Karen Xie <kxie@chelsio.com>
+ M:    Varun Prakash <varun@chelsio.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  W:    http://www.chelsio.com
@@@ -5411,7 -5565,7 +5565,7 @@@ W:      http://www.chelsio.co
  F:    drivers/net/ethernet/chelsio/cxgb4/
  
  CXGB4 ISCSI DRIVER (CXGB4I)
- M:    Karen Xie <kxie@chelsio.com>
+ M:    Varun Prakash <varun@chelsio.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  W:    http://www.chelsio.com
@@@ -5527,7 -5681,7 +5681,7 @@@ L:      linux-mm@kvack.or
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
  F:    Documentation/admin-guide/mm/damon/
- F:    Documentation/vm/damon/
+ F:    Documentation/mm/damon/
  F:    include/linux/damon.h
  F:    include/trace/events/damon.h
  F:    mm/damon/
@@@ -5782,6 -5936,7 +5936,7 @@@ L:      linux-pm@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
  F:    Documentation/devicetree/bindings/devfreq/
+ F:    Documentation/devicetree/bindings/interconnect/mediatek,cci.yaml
  F:    drivers/devfreq/
  F:    include/linux/devfreq.h
  F:    include/trace/events/devfreq.h
@@@ -5856,6 -6011,7 +6011,7 @@@ W:      http://www.dialog-semiconductor.com/
  F:    Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:    Documentation/devicetree/bindings/input/dlg,da72??.txt
  F:    Documentation/devicetree/bindings/mfd/da90*.txt
+ F:    Documentation/devicetree/bindings/mfd/da90*.yaml
  F:    Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
  F:    Documentation/devicetree/bindings/regulator/da92*.txt
  F:    Documentation/devicetree/bindings/regulator/slg51000.txt
@@@ -5894,7 -6050,7 +6050,7 @@@ F:      include/sound/da[79]*.
  F:    sound/soc/codecs/da[79]*.[ch]
  
  DIAMOND SYSTEMS GPIO-MM GPIO DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-gpio-mm.c
@@@ -5971,6 -6127,7 +6127,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  F:    drivers/dma/
+ F:    include/dt-bindings/dma/
  F:    include/linux/dma/
  F:    include/linux/dmaengine.h
  F:    include/linux/of_dma.h
@@@ -5979,7 -6136,6 +6136,6 @@@ DMA MAPPING HELPER
  M:    Christoph Hellwig <hch@lst.de>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
  R:    Robin Murphy <robin.murphy@arm.com>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -5992,7 -6148,6 +6148,6 @@@ F:      kernel/dma
  
  DMA MAPPING BENCHMARK
  M:    Xiang Chen <chenxiang66@hisilicon.com>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  F:    kernel/dma/map_benchmark.c
  F:    tools/testing/selftests/dma/
@@@ -6143,14 -6298,6 +6298,6 @@@ F:     Documentation/networking/device_driv
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
  F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
- DPT_I2O SCSI RAID DRIVER
- M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
- L:    linux-scsi@vger.kernel.org
- S:    Maintained
- W:    http://www.adaptec.com/
- F:    drivers/scsi/dpt*
- F:    drivers/scsi/dpt/
  DRBD DRIVER
  M:    Philipp Reisner <philipp.reisner@linbit.com>
  M:    Lars Ellenberg <lars.ellenberg@linbit.com>
@@@ -6246,6 -6393,13 +6393,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
  F:    drivers/gpu/drm/bridge/chipone-icn6211.c
  
+ DRM DRIVER FOR EBBG FT8719 PANEL
+ M:    Joel Selvaraj <jo@jsfamily.in>
+ S:    Maintained
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ F:    Documentation/devicetree/bindings/display/panel/ebbg,ft8719.yaml
+ F:    drivers/gpu/drm/panel/panel-ebbg-ft8719.c
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
@@@ -6304,6 -6458,12 +6458,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/i810/
  F:    include/uapi/drm/i810_drm.h
  
+ DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER
+ M:    Paul Kocialkowski <paul.kocialkowski@bootlin.com>
+ S:    Supported
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ F:    drivers/gpu/drm/logicvc/
  DRM DRIVER FOR LVDS PANELS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -6480,12 -6640,17 +6640,17 @@@ S:   Orphan / Obsolet
  F:    drivers/gpu/drm/savage/
  F:    include/uapi/drm/savage_drm.h
  
- DRM DRIVER FOR SIMPLE FRAMEBUFFERS
+ DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
  M:    Thomas Zimmermann <tzimmermann@suse.de>
+ M:    Javier Martinez Canillas <javierm@redhat.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
+ F:    drivers/gpu/drm/drm_aperture.c
  F:    drivers/gpu/drm/tiny/simpledrm.c
+ F:    drivers/video/aperture.c
+ F:    include/drm/drm_aperture.h
+ F:    include/linux/aperture.h
  
  DRM DRIVER FOR SIS VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -6523,6 -6688,12 +6688,12 @@@ DRM DRIVER FOR TDFX VIDEO CARD
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
  
+ DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
+ M:    Jagan Teki <jagan@amarulasolutions.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
+ F:    drivers/gpu/drm/bridge/ti-dlpc3433.c
  DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
  R:    Douglas Anderson <dianders@chromium.org>
  F:    Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
@@@ -6652,7 -6823,6 +6823,6 @@@ F:      drivers/gpu/drm/bridge
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <inki.dae@samsung.com>
- M:    Joonyoung Shim <jy0922.shim@samsung.com>
  M:    Seung-Woo Kim <sw0312.kim@samsung.com>
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -6681,6 -6851,16 +6851,16 @@@ F:    Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/imx/
  F:    drivers/gpu/ipu-v3/
  
+ DRM DRIVERS FOR FREESCALE IMX BRIDGE
+ M:    Liu Ying <victor.liu@nxp.com>
+ L:    dri-devel@lists.freedesktop.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-ldb.yaml
+ F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-combiner.yaml
+ F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-link.yaml
+ F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pxl2dpi.yaml
+ F:    drivers/gpu/drm/bridge/imx/
  DRM DRIVERS FOR GMA500 (Poulsbo, Moorestown and derivative chipsets)
  M:    Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -6725,6 -6905,7 +6905,7 @@@ L:      linux-mediatek@lists.infradead.org (
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
+ F:    drivers/phy/mediatek/phy-mtk-dp.c
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
  F:    drivers/phy/mediatek/phy-mtk-mipi*
  
@@@ -6734,7 -6915,7 +6915,7 @@@ L:      dri-devel@lists.freedesktop.or
  L:    linux-tegra@vger.kernel.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/tegra/linux.git
- F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
+ F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml
  F:    Documentation/devicetree/bindings/gpu/host1x/
  F:    drivers/gpu/drm/tegra/
  F:    drivers/gpu/host1x/
@@@ -6811,6 -6992,7 +6992,7 @@@ F:      drivers/gpu/drm/omapdrm
  
  DRM DRIVERS FOR V3D
  M:    Emma Anholt <emma@anholt.net>
+ M:    Melissa Wen <mwen@igalia.com>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
@@@ -7322,6 -7504,13 +7504,13 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/ibm/ehea/
  
+ ELM327 CAN NETWORK DRIVER
+ M:    Max Staudt <max@enpas.org>
+ L:    linux-can@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/networking/device_drivers/can/can327.rst
+ F:    drivers/net/can/can327.c
  EM28XX VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
  L:    linux-media@vger.kernel.org
@@@ -7332,7 -7521,7 +7521,7 @@@ F:      Documentation/admin-guide/media/em28
  F:    drivers/media/usb/em28xx/
  
  EMBEDDED LINUX
- M:    Matt Mackall <mpm@selenic.com>
+ M:    Olivia Mackall <olivia@selenic.com>
  M:    David Woodhouse <dwmw2@infradead.org>
  L:    linux-embedded@vger.kernel.org
  S:    Maintained
@@@ -7414,6 -7603,8 +7603,8 @@@ F:      include/video/s1d13xxxfb.
  EROFS FILE SYSTEM
  M:    Gao Xiang <xiang@kernel.org>
  M:    Chao Yu <chao@kernel.org>
+ R:    Yue Hu <huyue2@coolpad.com>
+ R:    Jeffle Xu <jefflexu@linux.alibaba.com>
  L:    linux-erofs@lists.ozlabs.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
@@@ -7427,6 -7618,13 +7618,13 @@@ S:    Maintaine
  F:    include/linux/errseq.h
  F:    lib/errseq.c
  
+ ESD CAN/USB DRIVERS
+ M:    Frank Jungclaus <frank.jungclaus@esd.eu>
+ R:    socketcan@esd.eu
+ L:    linux-can@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/can/usb/esd_usb.c
  ET131X NETWORK DRIVER
  M:    Mark Einon <mark.einon@gmail.com>
  S:    Odd Fixes
@@@ -7502,6 -7700,7 +7700,7 @@@ M:      Namjae Jeon <linkinjeon@kernel.org
  M:    Sungjong Seo <sj1557.seo@samsung.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git
  F:    fs/exfat/
  
  EXT2 FILE SYSTEM
@@@ -7577,7 -7776,6 +7776,6 @@@ F:      drivers/gpu/drm/exynos/exynos_dp
  
  EXYNOS SYSMMU (IOMMU) driver
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  S:    Maintained
  F:    drivers/iommu/exynos-iommu.c
@@@ -7703,9 -7901,6 +7901,6 @@@ F:      include/linux/fs.
  F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  F:    include/uapi/linux/openat2.h
- X:    fs/io-wq.c
- X:    fs/io-wq.h
- X:    fs/io_uring.c
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <riku.voipio@iki.fi>
@@@ -7804,6 -7999,7 +7999,7 @@@ FORTIFY_SOURC
  M:    Kees Cook <keescook@chromium.org>
  L:    linux-hardening@vger.kernel.org
  S:    Supported
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    include/linux/fortify-string.h
  F:    lib/test_fortify/*
  F:    scripts/test_fortify.sh
@@@ -7836,6 -8032,21 +8032,21 @@@ F:    Documentation/fpga
  F:    drivers/fpga/
  F:    include/linux/fpga/
  
+ INTEL MAX10 BMC SECURE UPDATES
+ M:    Russ Weight <russell.h.weight@intel.com>
+ L:    linux-fpga@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
+ F:    drivers/fpga/intel-m10-bmc-sec-update.c
+ MICROCHIP POLARFIRE FPGA DRIVERS
+ M:    Conor Dooley <conor.dooley@microchip.com>
+ R:    Ivan Bornyakov <i.bornyakov@metrotek.ru>
+ L:    linux-fpga@vger.kernel.org
+ S:    Supported
+ F:    Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
+ F:    drivers/fpga/microchip-spi.c
  FPU EMULATOR
  M:    Bill Metzenthen <billm@melbpc.org.au>
  S:    Maintained
@@@ -7941,7 -8152,6 +8152,6 @@@ L:      linux-fbdev@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/video/fbdev/imxfb.c
- F:    include/linux/platform_data/video-imxfb.h
  
  FREESCALE IMX DDR PMU DRIVER
  M:    Frank Li <Frank.li@nxp.com>
@@@ -8246,6 -8456,7 +8456,7 @@@ GCC PLUGIN
  M:    Kees Cook <keescook@chromium.org>
  L:    linux-hardening@vger.kernel.org
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
@@@ -8337,6 -8548,7 +8548,7 @@@ Q:      https://patchwork.kernel.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
  F:    Documentation/devicetree/bindings/phy/
  F:    drivers/phy/
+ F:    include/dt-bindings/phy/
  F:    include/linux/phy/
  
  GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
@@@ -8690,6 -8902,7 +8902,7 @@@ L:      linux-media@vger.kernel.or
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
+ F:    Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.yaml
  F:    drivers/staging/media/hantro/
  
@@@ -8716,7 -8929,7 +8929,7 @@@ F:      include/trace/events/hwmon*.
  K:    (devm_)?hwmon_device_(un)?register(|_with_groups|_with_info)
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
- M:    Matt Mackall <mpm@selenic.com>
+ M:    Olivia Mackall <olivia@selenic.com>
  M:    Herbert Xu <herbert@gondor.apana.org.au>
  L:    linux-crypto@vger.kernel.org
  S:    Odd fixes
@@@ -8966,16 -9179,31 +9179,31 @@@ F:   Documentation/admin-guide/perf/hisi-
  F:    Documentation/admin-guide/perf/hisi-pmu.rst
  F:    drivers/perf/hisilicon
  
- HISILICON QM AND ZIP Controller DRIVER
+ HISILICON HNS3 PMU DRIVER
+ M:    Guangbin Huang <huangguangbin2@huawei.com>
+ S:    Supported
+ F:    Documentation/admin-guide/perf/hns3-pmu.rst
+ F:    drivers/perf/hisilicon/hns3_pmu.c
+ HISILICON QM DRIVER
+ M:    Weili Qian <qianweili@huawei.com>
  M:    Zhou Wang <wangzhou1@hisilicon.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
- F:    Documentation/ABI/testing/debugfs-hisi-zip
+ F:    drivers/crypto/hisilicon/Kconfig
+ F:    drivers/crypto/hisilicon/Makefile
  F:    drivers/crypto/hisilicon/qm.c
  F:    drivers/crypto/hisilicon/sgl.c
- F:    drivers/crypto/hisilicon/zip/
  F:    include/linux/hisi_acc_qm.h
  
+ HISILICON ZIP Controller DRIVER
+ M:    Yang Shen <shenyang39@huawei.com>
+ M:    Zhou Wang <wangzhou1@hisilicon.com>
+ L:    linux-crypto@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/ABI/testing/debugfs-hisi-zip
+ F:    drivers/crypto/hisilicon/zip/
  HISILICON ROCE DRIVER
  M:    Wenpeng Liang <liangwenpeng@huawei.com>
  M:    Weihang Li <liweihang@huawei.com>
@@@ -9038,7 -9266,7 +9266,7 @@@ HMM - Heterogeneous Memory Managemen
  M:    Jérôme Glisse <jglisse@redhat.com>
  L:    linux-mm@kvack.org
  S:    Maintained
- F:    Documentation/vm/hmm.rst
+ F:    Documentation/mm/hmm.rst
  F:    include/linux/hmm*
  F:    lib/test_hmm*
  F:    mm/hmm*
@@@ -9136,8 -9364,8 +9364,8 @@@ L:      linux-mm@kvack.or
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  F:    Documentation/admin-guide/mm/hugetlbpage.rst
- F:    Documentation/vm/hugetlbfs_reserv.rst
- F:    Documentation/vm/vmemmap_dedup.rst
+ F:    Documentation/mm/hugetlbfs_reserv.rst
+ F:    Documentation/mm/vmemmap_dedup.rst
  F:    fs/hugetlbfs/
  F:    include/linux/hugetlb.h
  F:    mm/hugetlb.c
@@@ -9203,6 -9431,7 +9431,7 @@@ S:      Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  F:    Documentation/ABI/testing/debugfs-hyperv
+ F:    Documentation/virt/hyperv
  F:    Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
  F:    arch/arm64/hyperv
  F:    arch/arm64/include/asm/hyperv-tlfs.h
@@@ -9472,7 -9701,7 +9701,7 @@@ F:      arch/powerpc/platforms/powernv/copy-
  F:    arch/powerpc/platforms/powernv/vas*
  
  IBM Power Virtual Ethernet Device Driver
- M:    Cristobal Forno <cforno12@linux.ibm.com>
+ M:    Nick Child <nnac123@linux.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
@@@ -9548,6 -9777,7 +9777,7 @@@ F:      drivers/input/misc/ideapad_slidebar.
  
  IDMAPPED MOUNTS
  M:    Christian Brauner <brauner@kernel.org>
+ M:    Seth Forshee <sforshee@kernel.org>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
@@@ -9640,6 -9870,7 +9870,7 @@@ F:      Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/devicetree/bindings/iio/
  F:    drivers/iio/
  F:    drivers/staging/iio/
+ F:    include/dt-bindings/iio/
  F:    include/linux/iio/
  F:    tools/iio/
  
@@@ -9832,11 -10063,21 +10063,21 @@@ L: linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/i810/
  
+ INTEL 8255 GPIO DRIVER
+ M:    William Breathitt Gray <william.gray@linaro.org>
+ L:    linux-gpio@vger.kernel.org
+ S:    Maintained
+ F:    drivers/gpio/gpio-i8255.c
+ F:    drivers/gpio/gpio-i8255.h
  INTEL ASoC DRIVERS
  M:    Cezary Rojewski <cezary.rojewski@intel.com>
  M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  M:    Liam Girdwood <liam.r.girdwood@linux.intel.com>
- M:    Jie Yang <yang.jie@linux.intel.com>
+ M:    Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
+ M:    Bard Liao <yung-chuan.liao@linux.intel.com>
+ M:    Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
+ M:    Kai Vehmanen <kai.vehmanen@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/intel/
@@@ -9965,7 -10206,8 +10206,8 @@@ S:    Supporte
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  F:    drivers/dma/ioat*
  
- INTEL IADX DRIVER
+ INTEL IDXD DRIVER
+ M:    Fenghua Yu <fenghua.yu@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    dmaengine@vger.kernel.org
  S:    Supported
@@@ -9999,12 -10241,10 +10241,10 @@@ F: drivers/hid/intel-ish-hid
  INTEL IOMMU (VT-d)
  M:    David Woodhouse <dwmw2@infradead.org>
  M:    Lu Baolu <baolu.lu@linux.intel.com>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    drivers/iommu/intel/
- F:    include/linux/intel-iommu.h
  F:    include/linux/intel-svm.h
  
  INTEL IOP-ADMA DMA DRIVER
@@@ -10160,7 -10400,7 +10400,7 @@@ F:   drivers/gpio/gpio-*cove.
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  M:    Andy Shevchenko <andy@kernel.org>
- S:    Maintained
+ S:    Supported
  F:    drivers/mfd/intel_soc_pmic*
  F:    include/linux/mfd/intel_soc_pmic*
  
@@@ -10376,10 -10616,20 +10616,20 @@@ T:        git git://git.kernel.org/pub/scm/fs/
  F:    fs/iomap/
  F:    include/linux/iomap.h
  
- IOMMU DRIVERS
+ IOMMU DMA-API LAYER
+ M:    Robin Murphy <robin.murphy@arm.com>
+ L:    iommu@lists.linux.dev
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
+ F:    drivers/iommu/dma-iommu.c
+ F:    drivers/iommu/iova.c
+ F:    include/linux/dma-iommu.h
+ F:    include/linux/iova.h
+ IOMMU SUBSYSTEM
  M:    Joerg Roedel <joro@8bytes.org>
  M:    Will Deacon <will@kernel.org>
- L:    iommu@lists.linux-foundation.org
+ R:    Robin Murphy <robin.murphy@arm.com>
  L:    iommu@lists.linux.dev
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -10405,9 -10655,7 +10655,7 @@@ L:   io-uring@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.dk/linux-block
  T:    git git://git.kernel.dk/liburing
- F:    fs/io-wq.c
- F:    fs/io-wq.h
- F:    fs/io_uring.c
+ F:    io_uring/
  F:    include/linux/io_uring.h
  F:    include/uapi/linux/io_uring.h
  F:    tools/io_uring/
@@@ -10476,7 -10724,7 +10724,7 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/irqchip/
  
  ISA
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  S:    Maintained
  F:    Documentation/driver-api/isa.rst
  F:    drivers/base/isa.c
@@@ -10767,6 -11015,17 +11015,17 @@@ F: scripts/mk
  F:    scripts/mod/
  F:    scripts/package/
  
+ KERNEL HARDENING (not covered by other areas)
+ M:    Kees Cook <keescook@chromium.org>
+ L:    linux-hardening@vger.kernel.org
+ S:    Supported
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
+ F:    include/linux/overflow.h
+ F:    include/linux/randomize_kstack.h
+ F:    mm/usercopy.c
+ K:    \b(add|choose)_random_kstack_offset\b
+ K:    \b__check_(object_size|heap_object)\b
  KERNEL JANITORS
  L:    kernel-janitors@vger.kernel.org
  S:    Odd Fixes
@@@ -10814,11 -11073,13 +11073,13 @@@ R:        Sergey Senozhatsky <senozhatsky@chro
  L:    linux-cifs@vger.kernel.org
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
+ F:    Documentation/filesystems/cifs/ksmbd.rst
  F:    fs/ksmbd/
  F:    fs/smbfs_common/
  
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <brendanhiggins@google.com>
+ M:    David Gow <davidgow@google.com>
  L:    linux-kselftest@vger.kernel.org
  L:    kunit-dev@googlegroups.com
  S:    Maintained
@@@ -11381,8 -11642,8 +11642,8 @@@ F:   drivers/macintosh
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Michael Ellerman <mpe@ellerman.id.au>
- R:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
- R:    Paul Mackerras <paulus@samba.org>
+ R:    Nicholas Piggin <npiggin@gmail.com>
+ R:    Christophe Leroy <christophe.leroy@csgroup.eu>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  W:    https://github.com/linuxppc/wiki/wiki
@@@ -11577,7 -11838,7 +11838,7 @@@ F:   drivers/media/usb/dvb-usb-v2/lmedm04
  LOADPIN SECURITY MODULE
  M:    Kees Cook <keescook@chromium.org>
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/admin-guide/LSM/LoadPin.rst
  F:    security/loadpin/
  
@@@ -12165,7 -12426,6 +12426,6 @@@ F:   Documentation/devicetree/bindings/*/
  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/max77693.txt
  F:    drivers/*/*max77843.c
  F:    drivers/*/max14577*.c
  F:    drivers/*/max77686*.c
@@@ -12241,7 -12501,7 +12501,7 @@@ F:   drivers/net/ieee802154/mcr20a.
  F:    drivers/net/ieee802154/mcr20a.h
  
  MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
  F:    drivers/iio/dac/cio-dac.c
@@@ -12482,6 -12742,7 +12742,7 @@@ F:   Documentation/driver-api/media
  F:    Documentation/userspace-api/media/
  F:    drivers/media/
  F:    drivers/staging/media/
+ F:    include/dt-bindings/media/
  F:    include/linux/platform_data/media/
  F:    include/media/
  F:    include/uapi/linux/dvb/
@@@ -12539,7 -12800,6 +12800,6 @@@ F:   drivers/i2c/busses/i2c-mt65xx.
  
  MEDIATEK IOMMU DRIVER
  M:    Yong Wu <yong.wu@mediatek.com>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
@@@ -12553,12 -12813,6 +12813,12 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/media/mediatek-jpeg-*.yaml
  F:    drivers/media/platform/mediatek/jpeg/
  
 +MEDIATEK KEYPAD DRIVER
 +M:    Mattijs Korpershoek <mkorpershoek@baylibre.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml
 +F:    drivers/input/keyboard/mt6779-keypad.c
 +
  MEDIATEK MDP DRIVER
  M:    Minghsiu Tsai <minghsiu.tsai@mediatek.com>
  M:    Houlong Wei <houlong.wei@mediatek.com>
@@@ -12571,6 -12825,7 +12831,7 @@@ F:   drivers/media/platform/mediatek/vpu
  MEDIATEK MEDIA DRIVER
  M:    Tiffany Lin <tiffany.lin@mediatek.com>
  M:    Andrew-CT Chen <andrew-ct.chen@mediatek.com>
+ M:    Yunfei Dong <yunfei.dong@mediatek.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek,vcodec*.yaml
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
@@@ -12595,7 -12850,7 +12856,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/wireless/mediatek/mt76/
  
  MEDIATEK MT7601U WIRELESS LAN DRIVER
- M:    Jakub Kicinski <kubakici@wp.pl>
+ M:    Jakub Kicinski <kuba@kernel.org>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
@@@ -12892,6 -13147,7 +13153,7 @@@ W:   http://www.linux-mm.or
  T:    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
  T:    quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
  F:    include/linux/gfp.h
+ F:    include/linux/gfp_types.h
  F:    include/linux/memory_hotplug.h
  F:    include/linux/mm.h
  F:    include/linux/mmzone.h
@@@ -13105,6 -13361,7 +13367,7 @@@ M:   UNGLinuxDriver@microchip.co
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
+ F:    Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
  F:    drivers/net/dsa/microchip/*
  F:    include/linux/platform_data/microchip-ksz.h
  F:    net/dsa/tag_ksz.c
@@@ -13164,6 -13421,14 +13427,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
  F:    drivers/mtd/nand/raw/atmel/*
  
+ MICROCHIP OTPC DRIVER
+ M:    Claudiu Beznea <claudiu.beznea@microchip.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Supported
+ F:    Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
+ F:    drivers/nvmem/microchip-otpc.c
+ F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
  MICROCHIP PWM DRIVER
  M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -13240,6 -13505,12 +13511,12 @@@ F: drivers/scsi/smartpqi/smartpqi*.[ch
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
  
+ MICROSOFT SURFACE AGGREGATOR TABLET-MODE SWITCH
+ M:    Maximilian Luz <luzmaximilian@gmail.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ F:    drivers/platform/surface/surface_aggregator_tabletsw.c
  MICROSOFT SURFACE BATTERY AND AC DRIVERS
  M:    Maximilian Luz <luzmaximilian@gmail.com>
  L:    linux-pm@vger.kernel.org
@@@ -13311,6 -13582,12 +13588,12 @@@ F: include/linux/surface_acpi_notify.
  F:    include/linux/surface_aggregator/
  F:    include/uapi/linux/surface_aggregator/
  
+ MICROSOFT SURFACE SYSTEM AGGREGATOR HUB DRIVER
+ M:    Maximilian Luz <luzmaximilian@gmail.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ F:    drivers/platform/surface/surface_aggregator_hub.c
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <oliver@neukum.org>
  S:    Maintained
@@@ -13351,6 -13628,7 +13634,7 @@@ F:   Documentation/devicetree/bindings/mi
  F:    Documentation/mips/
  F:    arch/mips/
  F:    drivers/platform/mips/
+ F:    include/dt-bindings/mips/
  
  MIPS BOSTON DEVELOPMENT BOARD
  M:    Paul Burton <paulburton@kernel.org>
@@@ -13478,6 -13756,7 +13762,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
  F:    include/linux/module.h
  F:    kernel/module/
+ F:    scripts/module*
  
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:    Saravanan Sekar <sravanhome@gmail.com>
@@@ -13620,7 -13899,7 +13905,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/mt9v111.c
  
  MULTIFUNCTION DEVICES (MFD)
- M:    Lee Jones <lee.jones@linaro.org>
+ M:    Lee Jones <lee@kernel.org>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  F:    Documentation/devicetree/bindings/mfd/
@@@ -13768,12 -14047,11 +14053,11 @@@ L:        netdev@vger.kernel.or
  S:    Maintained
  F:    net/sched/sch_netem.c
  
- NETERION 10GbE DRIVERS (s2io/vxge)
+ NETERION 10GbE DRIVERS (s2io)
  M:    Jon Mason <jdmason@kudzu.us>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/neterion/s2io.rst
- F:    Documentation/networking/device_drivers/ethernet/neterion/vxge.rst
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER
@@@ -14190,6 -14468,7 +14474,7 @@@ W:   https://github.com/jonmason/ntb/wik
  T:    git git://github.com/jonmason/ntb.git
  F:    drivers/net/ntb_netdev.c
  F:    drivers/ntb/
+ F:    drivers/pci/endpoint/functions/pci-epf-*ntb.c
  F:    include/linux/ntb.h
  F:    include/linux/ntb_transport.h
  F:    tools/testing/selftests/ntb/
@@@ -14258,7 -14537,8 +14543,8 @@@ S:   Supporte
  W:    http://git.infradead.org/nvme.git
  T:    git://git.infradead.org/nvme.git
  F:    drivers/nvme/host/
- F:    include/linux/nvme.h
+ F:    drivers/nvme/common/
+ F:    include/linux/nvme*
  F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS FC TRANSPORT DRIVERS
@@@ -14298,7 -14578,8 +14584,8 @@@ S:   Maintaine
  F:    drivers/net/phy/nxp-c45-tja11xx.c
  
  NXP FSPI DRIVER
- M:    Ashish Kumar <ashish.kumar@nxp.com>
+ M:    Han Xu <han.xu@nxp.com>
+ M:    Haibo Chen <haibo.chen@nxp.com>
  R:    Yogesh Gaur <yogeshgaur.83@gmail.com>
  L:    linux-spi@vger.kernel.org
  S:    Maintained
@@@ -14773,6 -15054,7 +15060,7 @@@ M:   Daniel Scally <djrscally@gmail.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
+ F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml
  F:    drivers/media/i2c/ov5693.c
  
  OMNIVISION OV5695 SENSOR DRIVER
@@@ -14847,6 -15129,13 +15135,13 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov9734.c
  
+ ONBOARD USB HUB DRIVER
+ M:    Matthias Kaehlcke <mka@chromium.org>
+ L:    linux-usb@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub
+ F:    drivers/usb/misc/onboard_usb_hub.c
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-mtd@lists.infradead.org
@@@ -14933,7 -15222,7 +15228,7 @@@ M:   Peter Korsgaard <peter@korsgaard.com
  M:    Andrew Lunn <andrew@lunn.ch>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/i2c/i2c-ocores.txt
+ F:    Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
  F:    Documentation/i2c/busses/i2c-ocores.rst
  F:    drivers/i2c/busses/i2c-ocores.c
  F:    include/linux/platform_data/i2c-ocores.h
@@@ -15078,7 -15367,7 +15373,7 @@@ M:   Pasha Tatashin <pasha.tatashin@solee
  M:    Andrew Morton <akpm@linux-foundation.org>
  L:    linux-mm@kvack.org
  S:    Maintained
- F:    Documentation/vm/page_table_check.rst
+ F:    Documentation/mm/page_table_check.rst
  F:    include/linux/page_table_check.h
  F:    mm/page_table_check.c
  
@@@ -15604,6 -15893,14 +15899,14 @@@ L: linux-pci@vger.kernel.or
  S:    Maintained
  F:    drivers/pci/controller/dwc/*spear*
  
+ PCI DRIVER FOR XILINX VERSAL CPM
+ M:    Bharat Kumar Gogada <bharat.kumar.gogada@amd.com>
+ M:    Michal Simek <michal.simek@amd.com>
+ L:    linux-pci@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
+ F:    drivers/pci/controller/pcie-xilinx-cpm.c
  PCMCIA SUBSYSTEM
  M:    Dominik Brodowski <linux@dominikbrodowski.net>
  S:    Odd Fixes
@@@ -15772,6 -16069,7 +16075,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/pinctrl/
  F:    Documentation/driver-api/pin-control.rst
  F:    drivers/pinctrl/
+ F:    include/dt-bindings/pinctrl/
  F:    include/linux/pinctrl/
  
  PIN CONTROLLER - AMD
@@@ -15784,7 -16082,7 +16088,7 @@@ PIN CONTROLLER - FREESCAL
  M:    Dong Aisheng <aisheng.dong@nxp.com>
  M:    Fabio Estevam <festevam@gmail.com>
  M:    Shawn Guo <shawnguo@kernel.org>
- M:    Stefan Agner <stefan@agner.ch>
+ M:    Jacky Bai <ping.bai@nxp.com>
  R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
@@@ -15794,7 -16092,7 +16098,7 @@@ F:   drivers/pinctrl/freescale
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Andy Shevchenko <andy@kernel.org>
- S:    Maintained
+ S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
@@@ -15888,14 -16186,6 +16192,6 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
  F:    drivers/iio/chemical/pms7003.c
  
- PLATFORM FEATURE INFRASTRUCTURE
- M:    Juergen Gross <jgross@suse.com>
- S:    Maintained
- F:    arch/*/include/asm/platform-feature.h
- F:    include/asm-generic/platform-feature.h
- F:    include/linux/platform-feature.h
- F:    kernel/platform-feature.c
  PLDMFW LIBRARY
  M:    Jacob Keller <jacob.e.keller@intel.com>
  S:    Maintained
@@@ -16260,17 -16550,17 +16556,17 @@@ F:        drivers/media/rc/pwm-ir-tx.
  PWM SUBSYSTEM
  M:    Thierry Reding <thierry.reding@gmail.com>
  R:    Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
- M:    Lee Jones <lee.jones@linaro.org>
  L:    linux-pwm@vger.kernel.org
  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
- F:    Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
+ F:    Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml
  F:    Documentation/devicetree/bindings/pwm/
  F:    Documentation/driver-api/pwm.rst
  F:    drivers/gpio/gpio-mvebu.c
  F:    drivers/pwm/
  F:    drivers/video/backlight/pwm_bl.c
+ F:    include/dt-bindings/pwm/
  F:    include/linux/pwm.h
  F:    include/linux/pwm_backlight.h
  K:    pwm_(config|apply_state|ops)
@@@ -16316,9 -16606,12 +16612,12 @@@ F: drivers/crypto/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
- M:    Banajit Goswami <bgoswami@codeaurora.org>
+ M:    Banajit Goswami <bgoswami@quicinc.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
+ F:    include/dt-bindings/sound/qcom,wcd9335.h
+ F:    sound/soc/codecs/lpass-rx-macro.*
+ F:    sound/soc/codecs/lpass-tx-macro.*
  F:    sound/soc/codecs/lpass-va-macro.c
  F:    sound/soc/codecs/lpass-wsa-macro.*
  F:    sound/soc/codecs/msm8916-wcd-analog.c
@@@ -16326,7 -16619,9 +16625,9 @@@ F:   sound/soc/codecs/msm8916-wcd-digital
  F:    sound/soc/codecs/wcd9335.*
  F:    sound/soc/codecs/wcd934x.c
  F:    sound/soc/codecs/wcd-clsh-v2.*
+ F:    sound/soc/codecs/wcd-mbhc-v2.*
  F:    sound/soc/codecs/wsa881x.c
+ F:    sound/soc/codecs/wsa883x.c
  F:    sound/soc/qcom/
  
  QCOM EMBEDDED USB DEBUGGER (EUD)
@@@ -16592,12 -16887,18 +16893,18 @@@ M:        Robert Foss <robert.foss@linaro.org
  L:    linux-i2c@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt
+ F:    Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
  F:    drivers/i2c/busses/i2c-qcom-cci.c
  
+ QUALCOMM INTERCONNECT BWMON DRIVER
+ M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+ L:    linux-arm-msm@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
+ F:    drivers/soc/qcom/icc-bwmon.c
  QUALCOMM IOMMU
  M:    Rob Clark <robdclark@gmail.com>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -17111,6 -17412,19 +17418,19 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
  F:    drivers/iio/adc/rzg2l_adc.c
  
+ RENESAS RZ/N1 A5PSW SWITCH DRIVER
+ M:    Clément Léger <clement.leger@bootlin.com>
+ L:    linux-renesas-soc@vger.kernel.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
+ F:    Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
+ F:    drivers/net/dsa/rzn1_a5psw*
+ F:    drivers/net/pcs/pcs-rzn1-miic.c
+ F:    include/dt-bindings/net/pcs-rzn1-miic.h
+ F:    include/linux/pcs-rzn1-miic.h
+ F:    net/dsa/tag_rzn1_a5psw.c
  RENESAS RZ/N1 RTC CONTROLLER DRIVER
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  L:    linux-rtc@vger.kernel.org
@@@ -17209,13 -17523,19 +17529,19 @@@ N:        risc
  K:    riscv
  
  RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
- M:    Lewis Hanly <lewis.hanly@microchip.com>
  M:    Conor Dooley <conor.dooley@microchip.com>
+ M:    Daire McNamara <daire.mcnamara@microchip.com>
  L:    linux-riscv@lists.infradead.org
  S:    Supported
  F:    arch/riscv/boot/dts/microchip/
+ F:    drivers/char/hw_random/mpfs-rng.c
+ F:    drivers/clk/microchip/clk-mpfs.c
  F:    drivers/mailbox/mailbox-mpfs.c
+ F:    drivers/pci/controller/pcie-microchip-host.c
+ F:    drivers/rtc/rtc-mpfs.c
  F:    drivers/soc/microchip/
+ F:    drivers/spi/spi-microchip-core.c
+ F:    drivers/usb/musb/mpfs.c
  F:    include/soc/microchip/mpfs.h
  
  RNBD BLOCK DRIVERS
@@@ -17507,7 -17827,7 +17833,7 @@@ M:   Jason Herne <jjherne@linux.ibm.com
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
- F:    Documentation/s390/vfio-ap.rst
+ F:    Documentation/s390/vfio-ap*
  F:    drivers/s390/crypto/vfio_ap*
  
  S390 VFIO-CCW DRIVER
@@@ -17527,6 -17847,7 +17853,7 @@@ M:   Eric Farman <farman@linux.ibm.com
  L:    linux-s390@vger.kernel.org
  L:    kvm@vger.kernel.org
  S:    Supported
+ F:    arch/s390/kvm/pci*
  F:    drivers/vfio/pci/vfio_pci_zdev.c
  F:    include/uapi/linux/vfio_zdev.h
  
@@@ -17911,7 -18232,7 +18238,7 @@@ M:   Kees Cook <keescook@chromium.org
  R:    Andy Lutomirski <luto@amacapital.net>
  R:    Will Drewry <wad@chromium.org>
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/seccomp
  F:    Documentation/userspace-api/seccomp_filter.rst
  F:    include/linux/seccomp.h
  F:    include/uapi/linux/seccomp.h
@@@ -17982,12 -18303,13 +18309,13 @@@ S:        Supporte
  F:    Documentation/admin-guide/security-bugs.rst
  
  SECURITY SUBSYSTEM
+ M:    Paul Moore <paul@paul-moore.com>
  M:    James Morris <jmorris@namei.org>
  M:    "Serge E. Hallyn" <serge@hallyn.com>
  L:    linux-security-module@vger.kernel.org (suggested Cc:)
  S:    Supported
  W:    http://kernsec.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
  F:    security/
  X:    security/selinux/
  
@@@ -18090,6 -18412,7 +18418,7 @@@ SFF/SFP/SFP+ MODULE SUPPOR
  M:    Russell King <linux@armlinux.org.uk>
  L:    netdev@vger.kernel.org
  S:    Maintained
+ F:    Documentation/devicetree/bindings/net/sff,sfp.yaml
  F:    drivers/net/phy/phylink.c
  F:    drivers/net/phy/sfp*
  F:    include/linux/mdio/mdio-i2c.h
@@@ -18111,6 -18434,7 +18440,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <kgraul@linux.ibm.com>
+ M:    Wenjia Zhang <wenjia@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -18375,6 -18699,12 +18705,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    include/linux/sl?b*.h
  F:    mm/sl?b*
  
+ SLCAN CAN NETWORK DRIVER
+ M:    Dario Binacchi <dario.binacchi@amarulasolutions.com>
+ L:    linux-can@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/can/slcan/
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <jiangshanlai@gmail.com>
  M:    "Paul E. McKenney" <paulmck@kernel.org>
@@@ -18546,6 -18876,7 +18882,7 @@@ SOFTWARE RAID (Multiple Disks) SUPPOR
  M:    Song Liu <song@kernel.org>
  L:    linux-raid@vger.kernel.org
  S:    Supported
+ Q:    https://patchwork.kernel.org/project/linux-raid/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
  F:    drivers/md/Kconfig
  F:    drivers/md/Makefile
@@@ -18743,8 -19074,10 +19080,10 @@@ F: sound/soc
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
  M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  M:    Liam Girdwood <lgirdwood@gmail.com>
+ M:    Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
+ M:    Bard Liao <yung-chuan.liao@linux.intel.com>
  M:    Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
M:    Kai Vehmanen <kai.vehmanen@linux.intel.com>
R:    Kai Vehmanen <kai.vehmanen@linux.intel.com>
  M:    Daniel Baluta <daniel.baluta@nxp.com>
  L:    sound-open-firmware@alsa-project.org (moderated for non-subscribers)
  S:    Supported
@@@ -18833,7 -19166,7 +19172,7 @@@ F:   drivers/pinctrl/spear
  
  SPI NOR SUBSYSTEM
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
- M:    Pratyush Yadav <p.yadav@ti.com>
+ M:    Pratyush Yadav <pratyush@kernel.org>
  R:    Michael Walle <michael@walle.cc>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
@@@ -18993,6 -19326,7 +19332,7 @@@ F:   drivers/staging/olpc_dcon
  STAGING - REALTEK RTL8188EU DRIVERS
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  M:    Phillip Potter <phil@philpotter.co.uk>
+ R:    Pavel Skripkin <paskripkin@gmail.com>
  S:    Supported
  F:    drivers/staging/r8188eu/
  
@@@ -19223,7 -19557,6 +19563,6 @@@ F:   arch/x86/boot/video
  
  SWIOTLB SUBSYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -19304,8 -19637,9 +19643,9 @@@ F:   Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-creg-snps.c
  
  SYNOPSYS DESIGNWARE 8250 UART DRIVER
+ M:    Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
- S:    Maintained
+ S:    Supported
  F:    drivers/tty/serial/8250/8250_dw.c
  F:    drivers/tty/serial/8250/8250_dwlib.*
  F:    drivers/tty/serial/8250/8250_lpss.c
@@@ -19386,7 -19720,7 +19726,7 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdhci-pci-dwc-mshc.c
  
  SYSTEM CONFIGURATION (SYSCON)
- M:    Lee Jones <lee.jones@linaro.org>
+ M:    Lee Jones <lee@kernel.org>
  M:    Arnd Bergmann <arnd@arndb.de>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
@@@ -19704,7 -20038,7 +20044,7 @@@ M:   Sowjanya Komatineni <skomatineni@nvi
  L:    linux-media@vger.kernel.org
  L:    linux-tegra@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
+ F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml
  F:    drivers/staging/media/tegra-video/
  
  TEGRA XUSB PADCTL DRIVER
@@@ -19827,6 -20161,7 +20167,7 @@@ F:   Documentation/ABI/testing/sysfs-clas
  F:    Documentation/devicetree/bindings/thermal/
  F:    Documentation/driver-api/thermal/
  F:    drivers/thermal/
+ F:    include/dt-bindings/thermal/
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
  F:    include/uapi/linux/thermal.h
@@@ -20301,7 -20636,7 +20642,7 @@@ F:   tools/tracing/rtla
  
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <src.res@email.cn>
- L:    linux-doc-tw-discuss@lists.sourceforge.net
+ L:    linux-doc-tw-discuss@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  W:    https://github.com/srcres258/linux-doc
  T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
@@@ -20421,6 -20756,13 +20762,13 @@@ F: Documentation/filesystems/ubifs-auth
  F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
  
+ UBLK USERSPACE BLOCK DRIVER
+ M:    Ming Lei <ming.lei@redhat.com>
+ L:    linux-block@vger.kernel.org
+ S:    Maintained
+ F:    drivers/block/ublk_drv.c
+ F:    include/uapi/linux/ublk_cmd.h
  UCLINUX (M68KNOMMU AND COLDFIRE)
  M:    Greg Ungerer <gerg@linux-m68k.org>
  L:    linux-m68k@lists.linux-m68k.org
@@@ -20509,6 -20851,13 +20857,13 @@@ L: linux-mediatek@lists.infradead.org (
  S:    Maintained
  F:    drivers/ufs/host/ufs-mediatek*
  
+ UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER RENESAS HOOKS
+ M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+ L:    linux-renesas-soc@vger.kernel.org
+ L:    linux-scsi@vger.kernel.org
+ S:    Maintained
+ F:    drivers/ufs/host/ufs-renesas.c
  UNSORTED BLOCK IMAGES (UBI)
  M:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
@@@ -20949,6 -21298,7 +21304,7 @@@ M:   OGAWA Hirofumi <hirofumi@mail.parkne
  S:    Maintained
  F:    Documentation/filesystems/vfat.rst
  F:    fs/fat/
+ F:    tools/testing/selftests/filesystems/fat/
  
  VFIO DRIVER
  M:    Alex Williamson <alex.williamson@redhat.com>
@@@ -21124,6 -21474,7 +21480,7 @@@ M:   Jason Wang <jasowang@redhat.com
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-vdpa
+ F:    Documentation/ABI/testing/sysfs-class-vduse
  F:    Documentation/devicetree/bindings/virtio/
  F:    drivers/block/virtio_blk.c
  F:    drivers/crypto/virtio/
@@@ -21304,12 -21655,10 +21661,10 @@@ M:        Martyn Welch <martyn@welchs.me.uk
  M:    Manohar Vanga <manohar.vanga@gmail.com>
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-kernel@vger.kernel.org
- S:    Maintained
+ S:    Odd fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/vme.rst
  F:    drivers/staging/vme_user/
- F:    drivers/vme/
- F:    include/linux/vme*
  
  VM SOCKETS (AF_VSOCK)
  M:    Stefano Garzarella <sgarzare@redhat.com>
@@@ -21492,6 -21841,13 +21847,13 @@@ L: linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/input/tablet/wacom_serial4.c
  
+ WANGXUN ETHERNET DRIVER
+ M:    Jiawen Wu <jiawenwu@trustnetic.com>
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst
+ F:    drivers/net/ethernet/wangxun/
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <wim@linux-watchdog.org>
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -21535,13 -21891,13 +21897,13 @@@ S:        Maintaine
  F:    drivers/media/rc/winbond-cir.c
  
  WINSYSTEMS EBC-C384 WATCHDOG DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-watchdog@vger.kernel.org
  S:    Maintained
  F:    drivers/watchdog/ebc-c384_wdt.c
  
  WINSYSTEMS WS16C48 GPIO DRIVER
- M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-ws16c48.c
@@@ -21808,8 -22164,7 +22170,7 @@@ F:   include/uapi/linux/if_xdp.
  F:    include/uapi/linux/xdp_diag.h
  F:    include/net/netns/xdp.h
  F:    net/xdp/
- F:    samples/bpf/xdpsock*
- F:    tools/lib/bpf/xsk*
+ F:    tools/testing/selftests/bpf/*xsk*
  
  XEN BLOCK SUBSYSTEM
  M:    Roger Pau Monné <roger.pau@citrix.com>
@@@ -21845,12 -22200,14 +22206,14 @@@ F:        drivers/*/xen-*front.
  F:    drivers/xen/
  F:    include/uapi/xen/
  F:    include/xen/
+ F:    kernel/configs/xen.config
  
  XEN HYPERVISOR X86
  M:    Juergen Gross <jgross@suse.com>
  R:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
+ F:    arch/x86/configs/xen.config
  F:    arch/x86/include/asm/pvclock-abi.h
  F:    arch/x86/include/asm/xen/
  F:    arch/x86/platform/pvh/
@@@ -21899,7 -22256,6 +22262,6 @@@ XEN SWIOTLB SUBSYSTE
  M:    Juergen Gross <jgross@suse.com>
  M:    Stefano Stabellini <sstabellini@kernel.org>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
- L:    iommu@lists.linux-foundation.org
  L:    iommu@lists.linux.dev
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
@@@ -22050,7 -22406,7 +22412,7 @@@ F:   include/linux/yam.
  YAMA SECURITY MODULE
  M:    Kees Cook <keescook@chromium.org>
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/admin-guide/LSM/Yama.rst
  F:    security/yama/
  
@@@ -22164,7 -22520,7 +22526,7 @@@ M:   Nitin Gupta <ngupta@vflare.org
  R:    Sergey Senozhatsky <senozhatsky@chromium.org>
  L:    linux-mm@kvack.org
  S:    Maintained
- F:    Documentation/vm/zsmalloc.rst
+ F:    Documentation/mm/zsmalloc.rst
  F:    include/linux/zsmalloc.h
  F:    mm/zsmalloc.c
  
index fcf4b55cdf90f271bea6980792eac17269f088c4,cbc6c0d4670a2b26a9b5f75f018a7904a872b79a..fab5473ae5dac689574dbfae9b378699a1b5bc42
@@@ -202,7 -202,7 +202,7 @@@ struct command_protocol_tp_info 
  };
  
  /**
 - * struct touchpad_info - touchpad info response.
 + * struct touchpad_info_protocol - touchpad info response.
   * message.type = 0x1020, message.length = 0x006e
   *
   * @unknown1:         unknown
@@@ -1597,52 -1597,38 +1597,38 @@@ static u32 applespi_notify(acpi_handle 
  
  static int applespi_get_saved_bl_level(struct applespi_data *applespi)
  {
-       struct efivar_entry *efivar_entry;
+       efi_status_t sts = EFI_NOT_FOUND;
        u16 efi_data = 0;
-       unsigned long efi_data_len;
-       int sts;
-       efivar_entry = kmalloc(sizeof(*efivar_entry), GFP_KERNEL);
-       if (!efivar_entry)
-               return -ENOMEM;
-       memcpy(efivar_entry->var.VariableName, EFI_BL_LEVEL_NAME,
-              sizeof(EFI_BL_LEVEL_NAME));
-       efivar_entry->var.VendorGuid = EFI_BL_LEVEL_GUID;
-       efi_data_len = sizeof(efi_data);
+       unsigned long efi_data_len = sizeof(efi_data);
  
-       sts = efivar_entry_get(efivar_entry, NULL, &efi_data_len, &efi_data);
-       if (sts && sts != -ENOENT)
+       if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))
+               sts = efi.get_variable(EFI_BL_LEVEL_NAME, &EFI_BL_LEVEL_GUID,
+                                      NULL, &efi_data_len, &efi_data);
+       if (sts != EFI_SUCCESS && sts != EFI_NOT_FOUND)
                dev_warn(&applespi->spi->dev,
-                        "Error getting backlight level from EFI vars: %d\n",
+                        "Error getting backlight level from EFI vars: 0x%lx\n",
                         sts);
  
-       kfree(efivar_entry);
-       return sts ? sts : efi_data;
+       return sts != EFI_SUCCESS ? -ENODEV : efi_data;
  }
  
  static void applespi_save_bl_level(struct applespi_data *applespi,
                                   unsigned int level)
  {
-       efi_guid_t efi_guid;
+       efi_status_t sts = EFI_UNSUPPORTED;
        u32 efi_attr;
-       unsigned long efi_data_len;
        u16 efi_data;
-       int sts;
  
-       /* Save keyboard backlight level */
-       efi_guid = EFI_BL_LEVEL_GUID;
        efi_data = (u16)level;
-       efi_data_len = sizeof(efi_data);
        efi_attr = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |
                   EFI_VARIABLE_RUNTIME_ACCESS;
  
-       sts = efivar_entry_set_safe((efi_char16_t *)EFI_BL_LEVEL_NAME, efi_guid,
-                                   efi_attr, true, efi_data_len, &efi_data);
-       if (sts)
+       if (efi_rt_services_supported(EFI_RT_SUPPORTED_SET_VARIABLE))
+               sts = efi.set_variable(EFI_BL_LEVEL_NAME, &EFI_BL_LEVEL_GUID,
+                                      efi_attr, sizeof(efi_data), &efi_data);
+       if (sts != EFI_SUCCESS)
                dev_warn(&applespi->spi->dev,
-                        "Error saving backlight level to EFI vars: %d\n", sts);
+                        "Error saving backlight level to EFI vars: 0x%lx\n", sts);
  }
  
  static int applespi_probe(struct spi_device *spi)