rpmsg: char: Remove the unneeded result variable

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 21b58f9..9d7f64d 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
@@ -265,6 +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
@@ -285,38 +289,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 +741,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 +778,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 +821,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 +1020,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 +1030,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 +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
@@ -1360,7 +1379,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
@@ -1376,10 +1395,14 @@ F:      include/uapi/linux/apm_bios.h
 
 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/
 
@@ -1474,6 +1497,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 +1556,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 +1859,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 +1869,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 +1883,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 +2021,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
@@ -2147,7 +2178,7 @@ 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/spi/hpe,gxp-spifi.yaml
 F:     Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
 F:     arch/arm/boot/dts/hpe-bmc*
 F:     arch/arm/boot/dts/hpe-gxp*
@@ -2425,7 +2456,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/
@@ -2455,11 +2486,13 @@ S:      Supported
 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
 
@@ -2598,7 +2631,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 +2711,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 +2761,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 +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
@@ -3167,6 +3203,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
@@ -3469,7 +3512,7 @@ W:        https://wireless.wiki.kernel.org/en/users/Drivers/b43
 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
@@ -3571,7 +3614,6 @@ F:        lib/bitmap.c
 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
@@ -4408,7 +4450,7 @@ L:        linux-pm@vger.kernel.org
 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
@@ -4752,7 +4794,6 @@ L:        keyrings@vger.kernel.org
 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/
 
@@ -4880,6 +4921,7 @@ S:        Maintained
 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
@@ -4998,7 +5040,7 @@ R:        Nick Desaulniers <ndesaulniers@google.com>
 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
 
@@ -5090,16 +5132,20 @@ 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/
 F:     fs/smbfs_common/
+F:     include/uapi/linux/cifs
 
 COMPACTPCI HOTPLUG CORE
 M:     Scott Murray <scott@spiteful.org>
@@ -5165,6 +5211,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 +5287,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 +5534,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 +5566,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 +5682,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/
@@ -5890,6 +5937,7 @@ L:        linux-pm@vger.kernel.org
 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
@@ -5964,6 +6012,7 @@ W:        http://www.dialog-semiconductor.com/products
 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
@@ -6002,7 +6051,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
@@ -6079,6 +6128,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
@@ -6249,14 +6299,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>
@@ -6352,6 +6394,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
@@ -6410,6 +6459,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
@@ -6586,12 +6641,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
@@ -6629,6 +6689,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
@@ -6758,7 +6824,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
@@ -6787,6 +6852,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
@@ -6831,6 +6906,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*
 
@@ -6840,7 +6916,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/
@@ -6917,6 +6993,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
@@ -7428,6 +7505,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
@@ -7438,7 +7522,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
@@ -7535,6 +7619,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
@@ -7610,6 +7701,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
@@ -7810,9 +7902,6 @@ F:        include/linux/fs.h
 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>
@@ -7911,6 +8000,7 @@ FORTIFY_SOURCE
 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
@@ -7943,6 +8033,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
@@ -8048,7 +8153,6 @@ L:        linux-fbdev@vger.kernel.org
 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>
@@ -8353,6 +8457,7 @@ GCC PLUGINS
 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/
@@ -8444,6 +8549,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 +8903,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 +8930,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
@@ -9079,16 +9186,25 @@ S:      Supported
 F:     Documentation/admin-guide/perf/hns3-pmu.rst
 F:     drivers/perf/hisilicon/hns3_pmu.c
 
-HISILICON QM AND ZIP Controller DRIVER
+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>
@@ -9151,7 +9267,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*
@@ -9249,8 +9365,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
@@ -9316,6 +9432,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
@@ -9585,7 +9702,7 @@ F:        arch/powerpc/platforms/powernv/copy-paste.h
 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.*
@@ -9754,6 +9871,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/
 
@@ -9946,6 +10064,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>
@@ -10082,7 +10207,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
@@ -10120,7 +10246,6 @@ 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
@@ -10276,7 +10401,7 @@ F:      drivers/gpio/gpio-*cove.c
 
 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*
 
@@ -10492,9 +10617,20 @@ T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 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>
+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
@@ -10520,9 +10656,7 @@ L:      io-uring@vger.kernel.org
 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/
@@ -10591,7 +10725,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
@@ -10882,6 +11016,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
@@ -10929,11 +11074,13 @@ R:    Sergey Senozhatsky <senozhatsky@chromium.org>
 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
@@ -11496,8 +11643,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
@@ -11692,7 +11839,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/
 
@@ -12280,7 +12427,6 @@ F:      Documentation/devicetree/bindings/*/maxim,max77686.yaml
 F:     Documentation/devicetree/bindings/*/maxim,max77693.yaml
 F:     Documentation/devicetree/bindings/*/maxim,max77843.yaml
 F:     Documentation/devicetree/bindings/clock/maxim,max77686.txt
-F:     Documentation/devicetree/bindings/mfd/max77693.txt
 F:     drivers/*/*max77843.c
 F:     drivers/*/max14577*.c
 F:     drivers/*/max77686*.c
@@ -12356,7 +12502,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
@@ -12597,6 +12743,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/
@@ -12679,6 +12826,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
@@ -12703,7 +12851,7 @@ F:      Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
 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/
@@ -13000,6 +13148,7 @@ W:      http://www.linux-mm.org
 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
@@ -13213,6 +13362,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
@@ -13272,6 +13422,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)
@@ -13348,6 +13506,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
@@ -13419,6 +13583,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
@@ -13459,6 +13629,7 @@ F:      Documentation/devicetree/bindings/mips/
 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>
@@ -13586,6 +13757,7 @@ S:      Maintained
 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>
@@ -13728,7 +13900,7 @@ F:      Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
 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/
@@ -13876,12 +14048,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
@@ -14298,6 +14469,7 @@ W:      https://github.com/jonmason/ntb/wiki
 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/
@@ -14366,7 +14538,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
@@ -14882,6 +15055,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
@@ -14956,6 +15130,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
@@ -15042,7 +15223,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
@@ -15187,7 +15368,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
 
@@ -15713,6 +15894,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
@@ -15881,6 +16070,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 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
@@ -15997,14 +16187,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
@@ -16373,7 +16555,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
@@ -16428,6 +16610,9 @@ M:      Srinivas Kandagatla <srinivas.kandagatla@linaro.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
@@ -16435,7 +16620,9 @@ F:      sound/soc/codecs/msm8916-wcd-digital.c
 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)
@@ -16701,7 +16888,7 @@ 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
@@ -17226,6 +17413,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
@@ -17333,8 +17533,10 @@ 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
@@ -17626,7 +17828,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
@@ -17646,6 +17848,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
 
@@ -18030,7 +18233,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
@@ -18101,12 +18304,13 @@ S:    Supported
 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/
 
@@ -18209,6 +18413,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
@@ -18495,6 +18700,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>
@@ -18666,6 +18877,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
@@ -18955,7 +19167,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
@@ -19115,6 +19327,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/
 
@@ -19425,8 +19638,9 @@ F:      Documentation/devicetree/bindings/gpio/snps,creg-gpio.txt
 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
@@ -19507,7 +19721,7 @@ S:      Maintained
 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
@@ -19825,7 +20039,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
@@ -19948,6 +20162,7 @@ F:      Documentation/ABI/testing/sysfs-class-thermal
 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
@@ -20422,7 +20637,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
@@ -20542,6 +20757,13 @@ F:     Documentation/filesystems/ubifs-authentication.rst
 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
@@ -20630,6 +20852,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
@@ -21070,6 +21299,7 @@ M:      OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
 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>
@@ -21245,6 +21475,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/
@@ -21425,12 +21656,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>
@@ -21613,6 +21842,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>
@@ -21656,13 +21892,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
@@ -21929,8 +22165,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>
@@ -21966,12 +22201,14 @@ F:    drivers/*/xen-*front.c
 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/
@@ -22170,7 +22407,7 @@ F:      include/linux/yam.h
 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/
 
@@ -22284,7 +22521,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