Merge tag 'mm-stable-2022-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7aa3658..f692bd9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -171,7 +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
@@ -285,38 +284,37 @@ S:        Maintained
 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
@@ -738,6 +736,14 @@ S: Maintained
 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
@@ -767,6 +773,14 @@ T: git git://linuxtv.org/media_tree.git
 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
@@ -802,7 +816,7 @@ S:  Maintained
 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
@@ -1001,7 +1015,7 @@ AMD PMC DRIVER
 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>
@@ -1011,7 +1025,7 @@ 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
+F:     drivers/platform/x86/amd/hsmp.c
 
 AMD POWERPLAY AND SWSMU
 M:     Evan Quan <evan.quan@amd.com>
@@ -1333,7 +1347,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
@@ -1360,7 +1374,7 @@ S:        Maintained
 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
@@ -1474,6 +1488,13 @@ S:       Supported
 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>
@@ -1526,7 +1547,7 @@ F:        Documentation/devicetree/bindings/arm/arm,versatile.yaml
 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-*
@@ -1829,6 +1850,7 @@ ARM/APPLE MACHINE SUPPORT
 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
@@ -1838,6 +1860,7 @@ T:        git https://github.com/AsahiLinux/linux.git
 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
@@ -1851,6 +1874,7 @@ F:        Documentation/devicetree/bindings/power/apple*
 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
@@ -1988,11 +2012,9 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 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
@@ -2425,7 +2447,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 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/
@@ -2598,7 +2620,7 @@ L:        linux-unisoc@lists.infradead.org (moderated for non-subscribers)
 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-*
@@ -2678,6 +2700,7 @@ B:        mailto:linux-samsung-soc@vger.kernel.org
 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*
@@ -2727,6 +2750,7 @@ M:        Sylwester Nawrocki <s.nawrocki@samsung.com>
 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
@@ -2929,6 +2953,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
@@ -3167,6 +3192,13 @@ S:       Maintained
 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
@@ -5165,6 +5197,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*
@@ -5240,10 +5273,10 @@ F:      Documentation/hwmon/corsair-psu.rst
 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/
@@ -5487,7 +5520,7 @@ W:        http://www.chelsio.com
 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
@@ -5519,7 +5552,7 @@ W:        http://www.chelsio.com
 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
@@ -5635,7 +5668,7 @@ L:        linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-kernel-mm-damon
 F:     Documentation/admin-guide/mm/damon/
-F:     Documentation/vm/damon/
+F:     Documentation/mm/damon/
 F:     include/linux/damon.h
 F:     include/trace/events/damon.h
 F:     mm/damon/
@@ -6003,7 +6036,7 @@ F:        include/sound/da[79]*.h
 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
@@ -6080,6 +6113,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
 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
@@ -6250,14 +6284,6 @@ F:       Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-drive
 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>
@@ -6353,6 +6379,13 @@ S:       Maintained
 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
@@ -6411,6 +6444,12 @@ S:       Orphan / Obsolete
 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
@@ -6587,12 +6626,17 @@ S:      Orphan / Obsolete
 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
@@ -6630,6 +6674,12 @@ DRM DRIVER FOR TDFX VIDEO CARDS
 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
@@ -6759,7 +6809,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
@@ -6788,6 +6837,16 @@ F:       Documentation/devicetree/bindings/display/imx/
 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
@@ -6832,6 +6891,7 @@ L:        linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 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*
 
@@ -6841,7 +6901,7 @@ L:        dri-devel@lists.freedesktop.org
 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/
@@ -6918,6 +6978,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
@@ -7429,6 +7490,13 @@ L:       netdev@vger.kernel.org
 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
@@ -7439,7 +7507,7 @@ F:        Documentation/admin-guide/media/em28xx*
 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
@@ -7536,6 +7604,13 @@ S:       Maintained
 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
@@ -7942,6 +8017,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
@@ -8444,6 +8534,7 @@ Q:        https://patchwork.kernel.org/project/linux-phy/list/
 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
@@ -8797,6 +8888,7 @@ L:        linux-media@vger.kernel.org
 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/
 
@@ -8823,7 +8915,7 @@ F:        include/trace/events/hwmon*.h
 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
@@ -9160,7 +9252,7 @@ HMM - Heterogeneous Memory Management
 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*
@@ -9258,8 +9350,8 @@ L:        linux-mm@kvack.org
 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
@@ -9325,6 +9417,7 @@ S:        Supported
 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
@@ -9763,6 +9856,7 @@ F:        Documentation/ABI/testing/sysfs-bus-iio*
 F:     Documentation/devicetree/bindings/iio/
 F:     drivers/iio/
 F:     drivers/staging/iio/
+F:     include/dt-bindings/iio/
 F:     include/linux/iio/
 F:     tools/iio/
 
@@ -9955,6 +10049,13 @@ L:      linux-fbdev@vger.kernel.org
 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>
@@ -10091,7 +10192,8 @@ S:      Supported
 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
@@ -10598,7 +10700,7 @@ F:      Documentation/devicetree/bindings/interrupt-controller/
 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
@@ -12374,7 +12476,7 @@ F:      drivers/net/ieee802154/mcr20a.c
 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
@@ -12615,6 +12717,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/
@@ -12697,6 +12800,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
@@ -13231,6 +13335,7 @@ M:      UNGLinuxDriver@microchip.com
 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
@@ -13290,6 +13395,14 @@ S:     Supported
 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)
@@ -13366,6 +13479,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
@@ -13437,6 +13556,12 @@ F:     include/linux/surface_acpi_notify.h
 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
@@ -13894,12 +14019,11 @@ L:    netdev@vger.kernel.org
 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
@@ -14384,7 +14508,8 @@ S:      Supported
 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
@@ -14900,6 +15025,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
@@ -14974,6 +15100,13 @@ S:     Maintained
 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
@@ -15060,7 +15193,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
@@ -15205,7 +15338,7 @@ M:      Pasha Tatashin <pasha.tatashin@soleen.com>
 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
 
@@ -15731,6 +15864,14 @@ L:     linux-pci@vger.kernel.org
 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
@@ -16015,14 +16156,6 @@ S:     Maintained
 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
@@ -16391,7 +16524,7 @@ 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
@@ -17244,6 +17377,19 @@ S:     Supported
 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
@@ -17353,6 +17499,7 @@ F:      drivers/mailbox/mailbox-mpfs.c
 F:     drivers/pci/controller/pcie-microchip-host.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
@@ -17664,6 +17811,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
 
@@ -18228,6 +18376,7 @@ SFF/SFP/SFP+ MODULE SUPPORT
 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
@@ -18514,6 +18663,12 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
 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>
@@ -18685,6 +18840,7 @@ SOFTWARE RAID (Multiple Disks) SUPPORT
 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
@@ -18974,7 +19130,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
@@ -19134,6 +19290,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/
 
@@ -19844,7 +20001,7 @@ M:      Sowjanya Komatineni <skomatineni@nvidia.com>
 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
@@ -20442,7 +20599,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
@@ -20657,6 +20814,13 @@ L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 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
@@ -21272,6 +21436,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/
@@ -21452,12 +21617,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>
@@ -21640,6 +21803,13 @@ L:     linux-input@vger.kernel.org
 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>
@@ -21683,13 +21853,13 @@ S:    Maintained
 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
@@ -21956,8 +22126,7 @@ F:      include/uapi/linux/if_xdp.h
 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>
@@ -22311,7 +22480,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