Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-2.6-microblaze.git] / MAINTAINERS
index 38fe2f3..d5b1878 100644 (file)
@@ -77,21 +77,13 @@ Tips for patch submitters
 
 8.     Happy hacking.
 
-Descriptions of section entries
--------------------------------
+Descriptions of section entries and preferred order
+---------------------------------------------------
 
        M: *Mail* patches to: FullName <address@domain>
        R: Designated *Reviewer*: FullName <address@domain>
           These reviewers should be CCed on patches.
        L: *Mailing list* that is relevant to this area
-       W: *Web-page* with status/info
-       B: URI for where to file *bugs*. A web-page with detailed bug
-          filing info, a direct bug tracker link, or a mailto: URI.
-       C: URI for *chat* protocol, server and channel where developers
-          usually hang out, for example irc://server/channel.
-       Q: *Patchwork* web based patch tracking system site
-       T: *SCM* tree type and location.
-          Type is one of: git, hg, quilt, stgit, topgit
        S: *Status*, one of the following:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
@@ -102,30 +94,39 @@ Descriptions of section entries
           Obsolete:    Old code. Something tagged obsolete generally means
                        it has been replaced by a better system and you
                        should be using that.
+       W: *Web-page* with status/info
+       Q: *Patchwork* web based patch tracking system site
+       B: URI for where to file *bugs*. A web-page with detailed bug
+          filing info, a direct bug tracker link, or a mailto: URI.
+       C: URI for *chat* protocol, server and channel where developers
+          usually hang out, for example irc://server/channel.
        P: Subsystem Profile document for more details submitting
           patches to the given subsystem. This is either an in-tree file,
           or a URI. See Documentation/maintainer/maintainer-entry-profile.rst
           for details.
+       T: *SCM* tree type and location.
+          Type is one of: git, hg, quilt, stgit, topgit
        F: *Files* and directories wildcard patterns.
           A trailing slash includes all files and subdirectory files.
           F:   drivers/net/    all files in and below drivers/net
           F:   drivers/net/*   all files in drivers/net, but not below
           F:   */net/*         all files in "any top level directory"/net
           One pattern per line.  Multiple F: lines acceptable.
+       X: *Excluded* files and directories that are NOT maintained, same
+          rules as F:. Files exclusions are tested before file matches.
+          Can be useful for excluding a specific subdirectory, for instance:
+          F:   net/
+          X:   net/ipv6/
+          matches all files in and below net excluding net/ipv6/
        N: Files and directories *Regex* patterns.
-          N:   [^a-z]tegra     all files whose path contains the word tegra
+          N:   [^a-z]tegra     all files whose path contains tegra
+                               (not including files like integrator)
           One pattern per line.  Multiple N: lines acceptable.
           scripts/get_maintainer.pl has different behavior for files that
           match F: pattern and matches of N: patterns.  By default,
           get_maintainer will not look at git log history when an F: pattern
           match occurs.  When an N: match occurs, git log history is used
           to also notify the people that have git commit signatures.
-       X: *Excluded* files and directories that are NOT maintained, same
-          rules as F:. Files exclusions are tested before file matches.
-          Can be useful for excluding a specific subdirectory, for instance:
-          F:   net/
-          X:   net/ipv6/
-          matches all files in and below net excluding net/ipv6/
        K: *Content regex* (perl extended) pattern match in a patch or file.
           For instance:
           K: of_get_profile
@@ -176,7 +177,7 @@ L:  linux-wpan@vger.kernel.org
 S:     Maintained
 F:     net/6lowpan/
 F:     include/net/6lowpan.h
-F:     Documentation/networking/6lowpan.txt
+F:     Documentation/networking/6lowpan.rst
 
 6PACK NETWORK DRIVER FOR AX.25
 M:     Andreas Koensgen <ajk@comnets.uni-bremen.de>
@@ -214,7 +215,7 @@ Q:  http://patchwork.kernel.org/project/v9fs-devel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 T:     git git://github.com/martinetd/linux.git
 S:     Maintained
-F:     Documentation/filesystems/9p.txt
+F:     Documentation/filesystems/9p.rst
 F:     fs/9p/
 F:     net/9p/
 F:     include/net/9p/
@@ -236,7 +237,7 @@ M:  Adaptec OEM Raid Solutions <aacraid@microsemi.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.adaptec.com/
 S:     Supported
-F:     Documentation/scsi/aacraid.txt
+F:     Documentation/scsi/aacraid.rst
 F:     drivers/scsi/aacraid/
 
 ABI/API
@@ -303,8 +304,8 @@ F:  drivers/net/ethernet/alteon/acenic*
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 M:     Peter Kaestle <peter@piie.net>
 L:     platform-driver-x86@vger.kernel.org
-W:     http://piie.net/?section=acerhdf
 S:     Maintained
+W:     http://piie.net/?section=acerhdf
 F:     drivers/platform/x86/acerhdf.c
 
 ACER WMI LAPTOP EXTRAS
@@ -540,7 +541,7 @@ M:  Matthew Wilcox <willy@infradead.org>
 M:     Hannes Reinecke <hare@suse.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
-F:     Documentation/scsi/advansys.txt
+F:     Documentation/scsi/advansys.rst
 F:     drivers/scsi/advansys.c
 
 ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
@@ -584,7 +585,7 @@ AFFS FILE SYSTEM
 M:     David Sterba <dsterba@suse.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Odd Fixes
-F:     Documentation/filesystems/affs.txt
+F:     Documentation/filesystems/affs.rst
 F:     fs/affs/
 
 AFS FILESYSTEM
@@ -593,7 +594,7 @@ L:  linux-afs@lists.infradead.org
 S:     Supported
 F:     fs/afs/
 F:     include/trace/events/afs.h
-F:     Documentation/filesystems/afs.txt
+F:     Documentation/filesystems/afs.rst
 W:     https://www.infradead.org/~dhowells/kafs/
 
 AGPGART DRIVER
@@ -693,7 +694,7 @@ ALLWINNER CPUFREQ DRIVER
 M:     Yangtao Li <tiny.windzz@gmail.com>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
+F:     Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml
 F:     drivers/cpufreq/sun50i-cpufreq-nvmem.c
 
 ALLWINNER CRYPTO DRIVERS
@@ -931,6 +932,14 @@ S: Supported
 F:     drivers/iio/adc/ad7124.c
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 
+ANALOG DEVICES INC AD7192 DRIVER
+M:     Alexandru Tachici <alexandru.tachici@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7192.c
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
+
 ANALOG DEVICES INC AD7292 DRIVER
 M:     Marcelo Schmitt <marcelo.schmitt1@gmail.com>
 L:     linux-iio@vger.kernel.org
@@ -1081,6 +1090,15 @@ F:       drivers/iio/adc/ltc249*
 X:     drivers/iio/*/adjd*
 F:     drivers/staging/iio/*/ad*
 
+ANALOG DEVICES INC HMC425A DRIVER
+M:     Beniamin Bia <beniamin.bia@analog.com>
+M:     Michael Hennerich <michael.hennerich@analog.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     http://ez.analog.com/community/linux-device-drivers
+F:     Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
+F:     drivers/iio/amplifiers/hmc425a.c
+
 ANALOGBITS PLL LIBRARIES
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 S:     Supported
@@ -1280,7 +1298,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/arm-boards
 F:     Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt
-F:     Documentation/devicetree/bindings/clock/arm-integrator.txt
+F:     Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
 F:     Documentation/devicetree/bindings/i2c/i2c-versatile.txt
 F:     Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
 F:     Documentation/devicetree/bindings/mtd/arm-versatile.txt
@@ -1426,6 +1444,7 @@ M:        Will Deacon <will@kernel.org>
 R:     Robin Murphy <robin.murphy@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/iommu/arm,smmu*
 F:     drivers/iommu/arm-smmu*
 F:     drivers/iommu/io-pgtable-arm.c
 F:     drivers/iommu/io-pgtable-arm-v7s.c
@@ -1605,7 +1624,7 @@ F:        Documentation/devicetree/bindings/clock/bitmain,bm1880-clk.yaml
 F:     Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
-M:     Rob Herring <robh@kernel.org>
+M:     Andre Przywara <andre.przywara@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-highbank/
@@ -1676,12 +1695,15 @@ F:      arch/arm/mach-ep93xx/micro9.c
 ARM/CORESIGHT FRAMEWORK AND DRIVERS
 M:     Mathieu Poirier <mathieu.poirier@linaro.org>
 R:     Suzuki K Poulose <suzuki.poulose@arm.com>
+R:     Mike Leach <mike.leach@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/hwtracing/coresight/*
+F:     include/dt-bindings/arm/coresight-cti-dt.h
 F:     Documentation/trace/coresight/*
 F:     Documentation/devicetree/bindings/arm/coresight.txt
 F:     Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
+F:     Documentation/devicetree/bindings/arm/coresight-cti.yaml
 F:     Documentation/ABI/testing/sysfs-bus-coresight-devices-*
 F:     tools/perf/arch/arm/util/pmu.c
 F:     tools/perf/arch/arm/util/auxtrace.c
@@ -1928,7 +1950,7 @@ F:        Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
 F:     arch/arm/boot/dts/lpc43*
 F:     drivers/i2c/busses/i2c-lpc2k.c
 F:     drivers/memory/pl172.c
-F:     drivers/mtd/spi-nor/nxp-spifi.c
+F:     drivers/mtd/spi-nor/controllers/nxp-spifi.c
 F:     drivers/rtc/rtc-lpc24xx.c
 N:     lpc18xx
 
@@ -1995,7 +2017,9 @@ M:        Sean Wang <sean.wang@mediatek.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/rtc/rtc-mt2712.txt
 F:     Documentation/devicetree/bindings/rtc/rtc-mt7622.txt
+F:     drivers/rtc/rtc-mt2712.c
 F:     drivers/rtc/rtc-mt6397.c
 F:     drivers/rtc/rtc-mt7622.c
 
@@ -2274,8 +2298,9 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-rockchip@lists.infradead.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
 S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
+F:     Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
 F:     Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
+F:     Documentation/devicetree/bindings/spi/spi-rockchip.yaml
 F:     arch/arm/boot/dts/rk3*
 F:     arch/arm/boot/dts/rv1108*
 F:     arch/arm/mach-rockchip/
@@ -2546,9 +2571,9 @@ M:        Masahiro Yamada <yamada.masahiro@socionext.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
 S:     Maintained
-F:     Documentation/devicetree/bindings/arm/socionext/uniphier.txt
-F:     Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
-F:     Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
+F:     Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
+F:     Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
+F:     Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
 F:     arch/arm/boot/dts/uniphier*
 F:     arch/arm/include/asm/hardware/cache-uniphier.h
 F:     arch/arm/mach-uniphier/
@@ -2725,8 +2750,8 @@ L:        linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
-F:     drivers/pinctrl/aspeed/
 F:     Documentation/devicetree/bindings/pinctrl/aspeed,*
+F:     drivers/pinctrl/aspeed/
 
 ASPEED SCU INTERRUPT CONTROLLER DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
@@ -2748,8 +2773,8 @@ ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>
 L:     acpi4asus-user@lists.sourceforge.net
 L:     platform-driver-x86@vger.kernel.org
-W:     http://acpi4asus.sf.net
 S:     Maintained
+W:     http://acpi4asus.sf.net
 F:     drivers/platform/x86/asus*.c
 F:     drivers/platform/x86/eeepc*.c
 
@@ -2796,11 +2821,11 @@ F:      drivers/block/aoe/
 
 ATHEROS 71XX/9XXX GPIO DRIVER
 M:     Alban Bedel <albeu@free.fr>
+S:     Maintained
 W:     https://github.com/AlbanBedel/linux
 T:     git git://github.com/AlbanBedel/linux
-S:     Maintained
-F:     drivers/gpio/gpio-ath79.c
 F:     Documentation/devicetree/bindings/gpio/gpio-ath79.txt
+F:     drivers/gpio/gpio-ath79.c
 
 ATHEROS 71XX/9XXX USB PHY DRIVER
 M:     Alban Bedel <albeu@free.fr>
@@ -2957,6 +2982,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/sound/axentia,*
 F:     sound/soc/atmel/tse850-pcm5142.c
 
+AXI-FAN-CONTROL HARDWARE MONITOR DRIVER
+M:     Nuno Sá <nuno.sa@analog.com>
+W:     http://ez.analog.com/community/linux-device-drivers
+L:     linux-hwmon@vger.kernel.org
+S:     Supported
+F:     drivers/hwmon/axi-fan-control.c
+F:     Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml
+
 AXXIA I2C CONTROLLER
 M:     Krzysztof Adamski <krzysztof.adamski@nokia.com>
 L:     linux-i2c@vger.kernel.org
@@ -3063,7 +3096,7 @@ M:        Luis de Bethencourt <luisbg@kernel.org>
 M:     Salah Triki <salah.triki@gmail.com>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git
-F:     Documentation/filesystems/befs.txt
+F:     Documentation/filesystems/befs.rst
 F:     fs/befs/
 
 BFQ I/O SCHEDULER
@@ -3077,7 +3110,7 @@ F:        Documentation/block/bfq-iosched.rst
 BFS FILE SYSTEM
 M:     "Tigran A. Aivazian" <aivazian.tigran@gmail.com>
 S:     Maintained
-F:     Documentation/filesystems/bfs.txt
+F:     Documentation/filesystems/bfs.rst
 F:     fs/bfs/
 F:     include/uapi/linux/bfs_fs.h
 
@@ -3147,6 +3180,8 @@ R:        Martin KaFai Lau <kafai@fb.com>
 R:     Song Liu <songliubraving@fb.com>
 R:     Yonghong Song <yhs@fb.com>
 R:     Andrii Nakryiko <andriin@fb.com>
+R:     John Fastabend <john.fastabend@gmail.com>
+R:     KP Singh <kpsingh@chromium.org>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@ -3213,11 +3248,22 @@ L:      bpf@vger.kernel.org
 S:     Maintained
 F:     arch/powerpc/net/
 
-BPF JIT for RISC-V (RV64G)
+BPF JIT for RISC-V (32-bit)
+M:     Luke Nelson <luke.r.nels@gmail.com>
+M:     Xi Wang <xi.wang@gmail.com>
+L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     arch/riscv/net/
+X:     arch/riscv/net/bpf_jit_comp64.c
+
+BPF JIT for RISC-V (64-bit)
 M:     Björn Töpel <bjorn.topel@gmail.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     arch/riscv/net/
+X:     arch/riscv/net/bpf_jit_comp32.c
 
 BPF JIT for S390
 M:     Ilya Leoshkevich <iii@linux.ibm.com>
@@ -3422,8 +3468,8 @@ BROADCOM BRCMSTB GPIO DRIVER
 M:     Gregory Fong <gregory.0xf0@gmail.com>
 L:     bcm-kernel-feedback-list@broadcom.com
 S:     Supported
-F:     drivers/gpio/gpio-brcmstb.c
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
+F:     drivers/gpio/gpio-brcmstb.c
 
 BROADCOM BRCMSTB I2C DRIVER
 M:     Kamal Dasu <kdasu.kdev@gmail.com>
@@ -3431,7 +3477,7 @@ L:        linux-i2c@vger.kernel.org
 L:     bcm-kernel-feedback-list@broadcom.com
 S:     Supported
 F:     drivers/i2c/busses/i2c-brcmstb.c
-F:     Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
+F:     Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
 
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
 M:     Al Cooper <alcooperx@gmail.com>
@@ -3481,8 +3527,8 @@ BROADCOM KONA GPIO DRIVER
 M:     Ray Jui <rjui@broadcom.com>
 L:     bcm-kernel-feedback-list@broadcom.com
 S:     Supported
-F:     drivers/gpio/gpio-bcm-kona.c
 F:     Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
+F:     drivers/gpio/gpio-bcm-kona.c
 
 BROADCOM NETXTREME-E ROCE DRIVER
 M:     Selvin Xavier <selvin.xavier@broadcom.com>
@@ -3597,8 +3643,8 @@ F:        sound/pci/bt87x.c
 
 BT8XXGPIO DRIVER
 M:     Michael Buesch <m@bues.ch>
-W:     http://bu3sch.de/btgpio.php
 S:     Maintained
+W:     http://bu3sch.de/btgpio.php
 F:     drivers/gpio/gpio-bt8xx.c
 
 BTRFS FILE SYSTEM
@@ -3610,7 +3656,7 @@ W:        http://btrfs.wiki.kernel.org/
 Q:     http://patchwork.kernel.org/project/linux-btrfs/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
 S:     Maintained
-F:     Documentation/filesystems/btrfs.txt
+F:     Documentation/filesystems/btrfs.rst
 F:     fs/btrfs/
 F:     include/linux/btrfs*
 F:     include/uapi/linux/btrfs*
@@ -3649,6 +3695,7 @@ F:        sound/pci/oxygen/
 
 C-SKY ARCHITECTURE
 M:     Guo Ren <guoren@kernel.org>
+L:     linux-csky@vger.kernel.org
 T:     git https://github.com/c-sky/csky-linux.git
 S:     Supported
 F:     arch/csky/
@@ -3906,10 +3953,10 @@ W:      http://ceph.com/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 T:     git git://github.com/ceph/ceph-client.git
 S:     Supported
-F:     Documentation/filesystems/ceph.txt
+F:     Documentation/filesystems/ceph.rst
 F:     fs/ceph/
 
-CERTIFICATE HANDLING:
+CERTIFICATE HANDLING
 M:     David Howells <dhowells@redhat.com>
 M:     David Woodhouse <dwmw2@infradead.org>
 L:     keyrings@vger.kernel.org
@@ -3919,11 +3966,6 @@ F:       certs/
 F:     scripts/sign-file.c
 F:     scripts/extract-cert.c
 
-CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
-L:     devel@driverdev.osuosl.org
-S:     Obsolete
-F:     drivers/staging/wusbcore/
-
 CFAG12864B LCD DRIVER
 M:     Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 S:     Maintained
@@ -4016,12 +4058,12 @@ M:      Cheng-Yi Chiang <cychiang@chromium.org>
 S:     Maintained
 R:     Enric Balletbo i Serra <enric.balletbo@collabora.com>
 R:     Guenter Roeck <groeck@chromium.org>
-F:     Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
+F:     Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
 F:     sound/soc/codecs/cros_ec_codec.*
 
 CIRRUS LOGIC AUDIO CODEC DRIVERS
-M:     Brian Austin <brian.austin@cirrus.com>
-M:     Paul Handrigan <Paul.Handrigan@cirrus.com>
+M:     James Schulman <james.schulman@cirrus.com>
+M:     David Rhodes <david.rhodes@cirrus.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/cs*
@@ -4072,7 +4114,6 @@ F:        drivers/scsi/snic/
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
 M:     Govindarajulu Varadarajan <_govind@gmx.com>
-M:     Parvi Kaustubhi <pkaustub@cisco.com>
 S:     Supported
 F:     drivers/net/ethernet/cisco/enic/
 
@@ -4118,6 +4159,7 @@ B:        https://github.com/ClangBuiltLinux/linux/issues
 C:     irc://chat.freenode.net/clangbuiltlinux
 S:     Supported
 K:     \b(?i:clang|llvm)\b
+F:     Documentation/kbuild/llvm.rst
 
 CLEANCACHE API
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
@@ -4423,7 +4465,7 @@ F:        include/linux/cpuidle.h
 CRAMFS FILESYSTEM
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
-F:     Documentation/filesystems/cramfs.txt
+F:     Documentation/filesystems/cramfs.rst
 F:     fs/cramfs/
 
 CREATIVE SB0540
@@ -4474,7 +4516,7 @@ L:        linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/platform/sunxi/sun6i-csi/
-F:     Documentation/devicetree/bindings/media/sun6i-csi.txt
+F:     Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
 
 CW1200 WLAN driver
 M:     Solomon Peachy <pizza@shaftnet.org>
@@ -4542,7 +4584,9 @@ S:        Supported
 F:     drivers/scsi/cxgbi/cxgb3i
 
 CXGB4 CRYPTO DRIVER (chcr)
-M:     Atul Gupta <atul.gupta@chelsio.com>
+M:     Ayush Sawal <ayush.sawal@chelsio.com>
+M:     Vinay Kumar Yadav <vinay.yadav@chelsio.com>
+M:     Rohit Maheshwari <rohitm@chelsio.com>
 L:     linux-crypto@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -4571,7 +4615,7 @@ F:        drivers/infiniband/hw/cxgb4/
 F:     include/uapi/rdma/cxgb4-abi.h
 
 CXGB4VF ETHERNET DRIVER (CXGB4VF)
-M:     Casey Leedom <leedom@chelsio.com>
+M:     Vishal Kulkarni <vishal@gmail.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -4681,7 +4725,7 @@ L:        dc395x@twibble.org
 W:     http://twibble.org/dist/dc395x/
 W:     http://lists.twibble.org/mailman/listinfo/dc395x/
 S:     Maintained
-F:     Documentation/scsi/dc395x.txt
+F:     Documentation/scsi/dc395x.rst
 F:     drivers/scsi/dc395x.*
 
 DCCP PROTOCOL
@@ -4723,26 +4767,6 @@ S:       Maintained
 F:     drivers/media/platform/sunxi/sun8i-di/
 F:     Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
 
-DELL SMBIOS DRIVER
-M:     Pali Rohár <pali.rohar@gmail.com>
-M:     Mario Limonciello <mario.limonciello@dell.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/dell-smbios.*
-
-DELL SMBIOS SMM DRIVER
-M:     Mario Limonciello <mario.limonciello@dell.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/dell-smbios-smm.c
-
-DELL SMBIOS WMI DRIVER
-M:     Mario Limonciello <mario.limonciello@dell.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/dell-smbios-wmi.c
-F:     tools/wmi/dell-smbios-example.c
-
 DEFZA FDDI NETWORK DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
@@ -4765,17 +4789,37 @@ M:      Pali Rohár <pali.rohar@gmail.com>
 S:     Maintained
 F:     drivers/platform/x86/dell-rbtn.*
 
+DELL LAPTOP SMM DRIVER
+M:     Pali Rohár <pali.rohar@gmail.com>
+S:     Maintained
+F:     drivers/hwmon/dell-smm-hwmon.c
+F:     include/uapi/linux/i8k.h
+
 DELL REMOTE BIOS UPDATE DRIVER
 M:     Stuart Hayes <stuart.w.hayes@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/dell_rbu.c
 
-DELL LAPTOP SMM DRIVER
+DELL SMBIOS DRIVER
 M:     Pali Rohár <pali.rohar@gmail.com>
+M:     Mario Limonciello <mario.limonciello@dell.com>
+L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/hwmon/dell-smm-hwmon.c
-F:     include/uapi/linux/i8k.h
+F:     drivers/platform/x86/dell-smbios.*
+
+DELL SMBIOS SMM DRIVER
+M:     Mario Limonciello <mario.limonciello@dell.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/dell-smbios-smm.c
+
+DELL SMBIOS WMI DRIVER
+M:     Mario Limonciello <mario.limonciello@dell.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/dell-smbios-wmi.c
+F:     tools/wmi/dell-smbios-example.c
 
 DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
 M:     Stuart Hayes <stuart.w.hayes@gmail.com>
@@ -4784,17 +4828,17 @@ S:      Maintained
 F:     Documentation/driver-api/dcdbas.rst
 F:     drivers/platform/x86/dcdbas.*
 
+DELL WMI DESCRIPTOR DRIVER
+M:     Mario Limonciello <mario.limonciello@dell.com>
+S:     Maintained
+F:     drivers/platform/x86/dell-wmi-descriptor.c
+
 DELL WMI NOTIFICATIONS DRIVER
 M:     Matthew Garrett <mjg59@srcf.ucam.org>
 M:     Pali Rohár <pali.rohar@gmail.com>
 S:     Maintained
 F:     drivers/platform/x86/dell-wmi.c
 
-DELL WMI DESCRIPTOR DRIVER
-M:     Mario Limonciello <mario.limonciello@dell.com>
-S:     Maintained
-F:     drivers/platform/x86/dell-wmi-descriptor.c
-
 DELTA ST MEDIA DRIVER
 M:     Hugues Fruchet <hugues.fruchet@st.com>
 L:     linux-media@vger.kernel.org
@@ -4921,6 +4965,7 @@ F:        drivers/leds/leds-da90??.c
 F:     drivers/mfd/da903x.c
 F:     drivers/mfd/da90??-*.c
 F:     drivers/mfd/da91??-*.c
+F:     drivers/pinctrl/pinctrl-da90??.c
 F:     drivers/power/supply/da9052-battery.c
 F:     drivers/power/supply/da91??-*.c
 F:     drivers/regulator/da903x.c
@@ -5021,7 +5066,7 @@ L:        dri-devel@lists.freedesktop.org
 L:     linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 F:     drivers/dma-buf/
 F:     include/linux/dma-buf*
-F:     include/linux/reservation.h
+F:     include/linux/dma-resv.h
 F:     include/linux/*fence.h
 F:     Documentation/driver-api/dma-buf.rst
 K:     dma_(buf|fence|resv)
@@ -5201,7 +5246,7 @@ M:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 R:     "Rafael J. Wysocki" <rafael@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
 S:     Supported
-F:     Documentation/kobject.txt
+F:     Documentation/core-api/kobject.rst
 F:     drivers/base/
 F:     fs/debugfs/
 F:     fs/sysfs/
@@ -5262,6 +5307,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/tve200/
 
+DRM DRIVER FOR FEIXIN K101 IM2BA02 MIPI-DSI LCD PANELS
+M:     Icenowy Zheng <icenowy@aosc.io>
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
+F:     Documentation/devicetree/bindings/display/panel/feixin,k101-im2ba02.yaml
+
 DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
 M:     Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
@@ -5281,6 +5332,13 @@ S:       Maintained
 F:     drivers/gpu/drm/tiny/ili9225.c
 F:     Documentation/devicetree/bindings/display/ilitek,ili9225.txt
 
+DRM DRIVER FOR ILITEK ILI9486 PANELS
+M:     Kamlesh Gurudasani <kamlesh.gurudasani@gmail.com>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/tiny/ili9486.c
+F:     Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
+
 DRM DRIVER FOR HX8357D PANELS
 M:     Eric Anholt <eric@anholt.net>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5322,6 +5380,13 @@ F:       drivers/gpu/drm/msm/
 F:     include/uapi/drm/msm_drm.h
 F:     Documentation/devicetree/bindings/display/msm/
 
+DRM DRIVER FOR NOVATEK NT35510 PANELS
+M:     Linus Walleij <linus.walleij@linaro.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-novatek-nt35510.c
+F:     Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
+
 DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 M:     Ben Skeggs <bskeggs@redhat.com>
 L:     dri-devel@lists.freedesktop.org
@@ -5409,7 +5474,7 @@ M:        David Lechner <david@lechnology.com>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/tiny/st7735r.c
-F:     Documentation/devicetree/bindings/display/sitronix,st7735r.txt
+F:     Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
 
 DRM DRIVER FOR SONY ACX424AKP PANELS
 M:     Linus Walleij <linus.walleij@linaro.org>
@@ -5489,6 +5554,7 @@ F:        include/linux/vga*
 DRM DRIVERS AND MISC GPU PATCHES
 M:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 M:     Maxime Ripard <mripard@kernel.org>
+M:     Thomas Zimmermann <tzimmermann@suse.de>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5568,7 +5634,6 @@ S:        Supported
 F:     drivers/gpu/drm/fsl-dcu/
 F:     Documentation/devicetree/bindings/display/fsl,dcu.txt
 F:     Documentation/devicetree/bindings/display/fsl,tcon.txt
-F:     Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR FREESCALE IMX
@@ -5587,12 +5652,13 @@ S:      Maintained
 F:     drivers/gpu/drm/gma500/
 
 DRM DRIVERS FOR HISILICON
-M:     Xinliang Liu <z.liuxinliang@hisilicon.com>
+M:     Xinliang Liu <xinliang.liu@linaro.org>
 M:     Rongrong Zou <zourongrong@gmail.com>
+R:     John Stultz <john.stultz@linaro.org>
 R:     Xinwei Kong <kong.kongxinwei@hisilicon.com>
 R:     Chen Feng <puck.chen@hisilicon.com>
 L:     dri-devel@lists.freedesktop.org
-T:     git git://github.com/xin3liang/linux.git
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/hisilicon/
 F:     Documentation/devicetree/bindings/display/hisilicon/
@@ -5607,7 +5673,7 @@ F:        include/uapi/drm/lima_drm.h
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR MEDIATEK
-M:     CK Hu <ck.hu@mediatek.com>
+M:     Chun-Kuang Hu <chunkuang.hu@kernel.org>
 M:     Philipp Zabel <p.zabel@pengutronix.de>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
@@ -5667,7 +5733,7 @@ L:        dri-devel@lists.freedesktop.org
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/stm
-F:     Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
+F:     Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
 
 DRM DRIVERS FOR TI LCDC
 M:     Jyri Sarha <jsarha@ti.com>
@@ -5684,6 +5750,17 @@ S:       Maintained
 F:     drivers/gpu/drm/omapdrm/
 F:     Documentation/devicetree/bindings/display/ti/
 
+DRM DRIVERS FOR TI KEYSTONE
+M:     Jyri Sarha <jsarha@ti.com>
+M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+F:     drivers/gpu/drm/tidss/
+F:     Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
+F:     Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
+F:     Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+
 DRM DRIVERS FOR V3D
 M:     Eric Anholt <eric@anholt.net>
 S:     Supported
@@ -5710,7 +5787,7 @@ L:        dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/etnaviv/
 F:     include/uapi/drm/etnaviv_drm.h
-F:     Documentation/devicetree/bindings/display/etnaviv/
+F:     Documentation/devicetree/bindings/gpu/vivante,gc.yaml
 
 DRM DRIVERS FOR ZTE ZX
 M:     Shawn Guo <shawnguo@kernel.org>
@@ -5932,13 +6009,13 @@ S:      Maintained
 F:     drivers/media/dvb-frontends/ec100*
 
 ECRYPT FILE SYSTEM
-M:     Tyler Hicks <tyhicks@canonical.com>
+M:     Tyler Hicks <code@tyhicks.com>
 L:     ecryptfs@vger.kernel.org
 W:     http://ecryptfs.org
 W:     https://launchpad.net/ecryptfs
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
-S:     Supported
-F:     Documentation/filesystems/ecryptfs.txt
+S:     Odd Fixes
+F:     Documentation/filesystems/ecryptfs.rst
 F:     fs/ecryptfs/
 
 EDAC-AMD64
@@ -5998,6 +6075,12 @@ F:       Documentation/driver-api/edac.rst
 F:     drivers/edac/
 F:     include/linux/edac.h
 
+EDAC-DMC520
+M:     Lei Wang <lewan@microsoft.com>
+L:     linux-edac@vger.kernel.org
+S:     Supported
+F:     drivers/edac/dmc520_edac.c
+
 EDAC-E752X
 M:     Mark Gross <mark.gross@intel.com>
 L:     linux-edac@vger.kernel.org
@@ -6197,7 +6280,6 @@ S:        Supported
 F:     drivers/scsi/be2iscsi/
 
 Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
-M:     Sathya Perla <sathya.perla@broadcom.com>
 M:     Ajit Khaparde <ajit.khaparde@broadcom.com>
 M:     Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
 M:     Somnath Kotur <somnath.kotur@broadcom.com>
@@ -6249,12 +6331,12 @@ F:      drivers/video/fbdev/s1d13xxxfb.c
 F:     include/video/s1d13xxxfb.h
 
 EROFS FILE SYSTEM
-M:     Gao Xiang <gaoxiang25@huawei.com>
+M:     Gao Xiang <xiang@kernel.org>
 M:     Chao Yu <yuchao0@huawei.com>
 L:     linux-erofs@lists.ozlabs.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
-F:     Documentation/filesystems/erofs.txt
+F:     Documentation/filesystems/erofs.rst
 F:     fs/erofs/
 F:     include/trace/events/erofs.h
 
@@ -6306,16 +6388,17 @@ F:      include/uapi/linux/mdio.h
 F:     include/uapi/linux/mii.h
 
 EXFAT FILE SYSTEM
-M:     Valdis Kletnieks <valdis.kletnieks@vt.edu>
+M:     Namjae Jeon <namjae.jeon@samsung.com>
+M:     Sungjong Seo <sj1557.seo@samsung.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/exfat/
+F:     fs/exfat/
 
 EXT2 FILE SYSTEM
 M:     Jan Kara <jack@suse.com>
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
-F:     Documentation/filesystems/ext2.txt
+F:     Documentation/filesystems/ext2.rst
 F:     fs/ext2/
 F:     include/linux/ext2*
 
@@ -6343,7 +6426,6 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 S:     Maintained
 F:     Documentation/admin-guide/efi-stub.rst
 F:     arch/*/kernel/efi.c
-F:     arch/x86/boot/compressed/eboot.[ch]
 F:     arch/*/include/asm/efi.h
 F:     arch/x86/platform/efi/
 F:     drivers/firmware/efi/
@@ -6389,7 +6471,7 @@ L:        linux-f2fs-devel@lists.sourceforge.net
 W:     https://f2fs.wiki.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 S:     Maintained
-F:     Documentation/filesystems/f2fs.txt
+F:     Documentation/filesystems/f2fs.rst
 F:     Documentation/ABI/testing/sysfs-fs-f2fs
 F:     fs/f2fs/
 F:     include/linux/f2fs_fs.h
@@ -6859,6 +6941,13 @@ S:       Maintained
 F:     drivers/i2c/busses/i2c-fsi.c
 F:     Documentation/devicetree/bindings/i2c/i2c-fsi.txt
 
+FSI-ATTACHED SPI DRIVER
+M:     Eddie James <eajames@linux.ibm.com>
+L:     linux-spi@vger.kernel.org
+S:     Maintained
+F:     drivers/spi/spi-fsi.c
+F:     Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml
+
 FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE
 M:     Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
@@ -6934,7 +7023,7 @@ S:        Maintained
 F:     scripts/gcc-plugins/
 F:     scripts/gcc-plugin.sh
 F:     scripts/Makefile.gcc-plugins
-F:     Documentation/core-api/gcc-plugins.rst
+F:     Documentation/kbuild/gcc-plugins.rst
 
 GASKET DRIVER FRAMEWORK
 M:     Rob Springer <rspringer@google.com>
@@ -7047,7 +7136,7 @@ L:        kvm@vger.kernel.org
 S:     Supported
 F:     drivers/uio/uio_pci_generic.c
 
-GENERIC VDSO LIBRARY:
+GENERIC VDSO LIBRARY
 M:     Andy Lutomirski <luto@kernel.org>
 M:     Thomas Gleixner <tglx@linutronix.de>
 M:     Vincenzo Frascino <vincenzo.frascino@arm.com>
@@ -7143,18 +7232,18 @@ GPIO SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 M:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
 L:     linux-gpio@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
+F:     Documentation/ABI/obsolete/sysfs-gpio
+F:     Documentation/ABI/testing/gpio-cdev
+F:     Documentation/admin-guide/gpio/
 F:     Documentation/devicetree/bindings/gpio/
 F:     Documentation/driver-api/gpio/
-F:     Documentation/admin-guide/gpio/
-F:     Documentation/ABI/testing/gpio-cdev
-F:     Documentation/ABI/obsolete/sysfs-gpio
 F:     drivers/gpio/
+F:     include/asm-generic/gpio.h
 F:     include/linux/gpio/
 F:     include/linux/gpio.h
 F:     include/linux/of_gpio.h
-F:     include/asm-generic/gpio.h
 F:     include/uapi/linux/gpio.h
 F:     tools/gpio/
 
@@ -7348,8 +7437,8 @@ F:        drivers/media/usb/hackrf/
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:     Frank Seidel <frank@f-seidel.de>
 L:     platform-driver-x86@vger.kernel.org
-W:     http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:     Maintained
+W:     http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 F:     drivers/platform/x86/hdaps.c
 
 HARDWARE MONITORING
@@ -7416,7 +7505,7 @@ M:        Don Brace <don.brace@microsemi.com>
 L:     esc.storagedev@microsemi.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
-F:     Documentation/scsi/hpsa.txt
+F:     Documentation/scsi/hpsa.rst
 F:     drivers/scsi/hpsa*.[ch]
 F:     include/linux/cciss*.h
 F:     include/uapi/linux/cciss*.h
@@ -7431,13 +7520,13 @@ F:      drivers/infiniband/hw/hfi1
 HFS FILESYSTEM
 L:     linux-fsdevel@vger.kernel.org
 S:     Orphan
-F:     Documentation/filesystems/hfs.txt
+F:     Documentation/filesystems/hfs.rst
 F:     fs/hfs/
 
 HFSPLUS FILESYSTEM
 L:     linux-fsdevel@vger.kernel.org
 S:     Orphan
-F:     Documentation/filesystems/hfsplus.txt
+F:     Documentation/filesystems/hfsplus.rst
 F:     fs/hfsplus/
 
 HGA FRAMEBUFFER DRIVER
@@ -7505,7 +7594,7 @@ HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
 M:     HighPoint Linux Team <linux@highpoint-tech.com>
 W:     http://www.highpoint-tech.com
 S:     Supported
-F:     Documentation/scsi/hptiop.txt
+F:     Documentation/scsi/hptiop.rst
 F:     drivers/scsi/hptiop.c
 
 HIPPI
@@ -7517,6 +7606,12 @@ F:       include/uapi/linux/if_hippi.h
 F:     net/802/hippi.c
 F:     drivers/net/hippi/
 
+HISILICON DMA DRIVER
+M:     Zhou Wang <wangzhou1@hisilicon.com>
+L:     dmaengine@vger.kernel.org
+S:     Maintained
+F:     drivers/dma/hisi_dma.c
+
 HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 M:     Zaibo Xu <xuzaibo@huawei.com>
 L:     linux-crypto@vger.kernel.org
@@ -7574,7 +7669,8 @@ F:        Documentation/admin-guide/perf/hisi-pmu.rst
 
 HISILICON ROCE DRIVER
 M:     Lijun Ou <oulijun@huawei.com>
-M:     Wei Hu(Xavier) <xavier.huwei@huawei.com>
+M:     Wei Hu(Xavier) <huwei87@hisilicon.com>
+M:     Weihang Li <liweihang@huawei.com>
 L:     linux-rdma@vger.kernel.org
 S:     Maintained
 F:     drivers/infiniband/hw/hns/
@@ -7737,7 +7833,7 @@ Hyper-V CORE AND DRIVERS
 M:     "K. Y. Srinivasan" <kys@microsoft.com>
 M:     Haiyang Zhang <haiyangz@microsoft.com>
 M:     Stephen Hemminger <sthemmin@microsoft.com>
-M:     Sasha Levin <sashal@kernel.org>
+M:     Wei Liu <wei.liu@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 L:     linux-hyperv@vger.kernel.org
 S:     Supported
@@ -7769,6 +7865,10 @@ F:       Documentation/ABI/testing/debugfs-hyperv
 
 HYPERBUS SUPPORT
 M:     Vignesh Raghavendra <vigneshr@ti.com>
+L:     linux-mtd@lists.infradead.org
+Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/next
+C:     irc://irc.oftc.net/mtd
 S:     Supported
 F:     drivers/mtd/hyperbus/
 F:     include/linux/mtd/hyperbus.h
@@ -7945,6 +8045,7 @@ L:        linux-ia64@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:     Maintained
 F:     arch/ia64/
+F:     Documentation/ia64/
 
 IBM Power 842 compression accelerator
 M:     Haren Myneni <haren@us.ibm.com>
@@ -8055,8 +8156,8 @@ F:        drivers/scsi/ips.*
 ICH LPC AND GPIO DRIVER
 M:     Peter Tyser <ptyser@xes-inc.com>
 S:     Maintained
-F:     drivers/mfd/lpc_ich.c
 F:     drivers/gpio/gpio-ich.c
+F:     drivers/mfd/lpc_ich.c
 
 ICY I2C DRIVER
 M:     Max Staudt <max@enpas.org>
@@ -8084,15 +8185,15 @@ F:      drivers/ide/ide-cd*
 IDEAPAD LAPTOP EXTRAS DRIVER
 M:     Ike Panhc <ike.pan@canonical.com>
 L:     platform-driver-x86@vger.kernel.org
-W:     http://launchpad.net/ideapad-laptop
 S:     Maintained
+W:     http://launchpad.net/ideapad-laptop
 F:     drivers/platform/x86/ideapad-laptop.c
 
 IDEAPAD LAPTOP SLIDEBAR DRIVER
 M:     Andrey Moiseev <o2g.org.ru@gmail.com>
 L:     linux-input@vger.kernel.org
-W:     https://github.com/o2genum/ideapad-slidebar
 S:     Maintained
+W:     https://github.com/o2genum/ideapad-slidebar
 F:     drivers/input/misc/ideapad_slidebar.c
 
 IDT VersaClock 5 CLOCK DRIVER
@@ -8308,7 +8409,7 @@ M:        Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
-F:     Documentation/filesystems/inotify.txt
+F:     Documentation/filesystems/inotify.rst
 F:     fs/notify/inotify/
 F:     include/linux/inotify.h
 F:     include/uapi/linux/inotify.h
@@ -8392,7 +8493,7 @@ M:        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
 M:     Rodrigo Vivi <rodrigo.vivi@intel.com>
 L:     intel-gfx@lists.freedesktop.org
 W:     https://01.org/linuxgraphics/
-B:     https://01.org/linuxgraphics/documentation/how-report-bugs
+B:     https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs
 C:     irc://chat.freenode.net/intel-gfx
 Q:     http://patchwork.freedesktop.org/project/intel-gfx/
 T:     git git://anongit.freedesktop.org/drm-intel
@@ -8477,7 +8578,6 @@ L:        dmaengine@vger.kernel.org
 S:     Supported
 F:     drivers/dma/idxd/*
 F:     include/uapi/linux/idxd.h
-F:     include/linux/idxd.h
 
 INTEL IDLE DRIVER
 M:     Jacob Pan <jacob.jun.pan@linux.intel.com>
@@ -8559,8 +8659,8 @@ F:        samples/mei/*
 INTEL MENLOW THERMAL DRIVER
 M:     Sujith Thomas <sujith.thomas@intel.com>
 L:     platform-driver-x86@vger.kernel.org
-W:     https://01.org/linux-acpi
 S:     Supported
+W:     https://01.org/linux-acpi
 F:     drivers/platform/x86/intel_menlow.c
 
 INTEL MIC DRIVERS (mic)
@@ -8569,15 +8669,15 @@ M:      Ashutosh Dixit <ashutosh.dixit@intel.com>
 S:     Supported
 W:     https://github.com/sudeepdutt/mic
 W:     http://software.intel.com/en-us/mic-developer
+F:     Documentation/misc-devices/mic/
+F:     drivers/dma/mic_x100_dma.c
+F:     drivers/dma/mic_x100_dma.h
+F:     drivers/misc/mic/
 F:     include/linux/mic_bus.h
 F:     include/linux/scif.h
 F:     include/uapi/linux/mic_common.h
 F:     include/uapi/linux/mic_ioctl.h
 F:     include/uapi/linux/scif_ioctl.h
-F:     drivers/misc/mic/
-F:     drivers/dma/mic_x100_dma.c
-F:     drivers/dma/mic_x100_dma.h
-F:     Documentation/mic/
 
 INTEL PMC CORE DRIVER
 M:     Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
@@ -8590,10 +8690,10 @@ INTEL PMC/P-Unit IPC DRIVER
 M:     Zha Qipeng<qipeng.zha@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/intel_pmc_ipc.c
-F:     drivers/platform/x86/intel_punit_ipc.c
 F:     arch/x86/include/asm/intel_pmc_ipc.h
 F:     arch/x86/include/asm/intel_punit_ipc.h
+F:     drivers/platform/x86/intel_pmc_ipc.c
+F:     drivers/platform/x86/intel_punit_ipc.c
 
 INTEL PMIC GPIO DRIVERS
 M:     Andy Shevchenko <andy@kernel.org>
@@ -8638,8 +8738,8 @@ M:        Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/intel_speed_select_if/
-F:     tools/power/x86/intel-speed-select/
 F:     include/uapi/linux/isst_if.h
+F:     tools/power/x86/intel-speed-select/
 
 INTEL STRATIX10 FIRMWARE DRIVERS
 M:     Richard Gong <richard.gong@linux.intel.com>
@@ -8684,7 +8784,7 @@ M:        Emmanuel Grumbach <emmanuel.grumbach@intel.com>
 M:     Luca Coelho <luciano.coelho@intel.com>
 M:     Intel Linux Wireless <linuxwifi@intel.com>
 L:     linux-wireless@vger.kernel.org
-W:     http://intellinuxwireless.org
+W:     https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 S:     Supported
 F:     drivers/net/wireless/intel/iwlwifi/
@@ -9163,7 +9263,7 @@ F:        virt/kvm/*
 F:     tools/kvm/
 F:     tools/testing/selftests/kvm/
 
-KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
+KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 M:     Marc Zyngier <maz@kernel.org>
 R:     James Morse <james.morse@arm.com>
 R:     Julien Thierry <julien.thierry.kdev@gmail.com>
@@ -9172,9 +9272,6 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     kvmarm@lists.cs.columbia.edu
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
 S:     Maintained
-F:     arch/arm/include/uapi/asm/kvm*
-F:     arch/arm/include/asm/kvm*
-F:     arch/arm/kvm/
 F:     arch/arm64/include/uapi/asm/kvm*
 F:     arch/arm64/include/asm/kvm*
 F:     arch/arm64/kvm/
@@ -9209,6 +9306,7 @@ L:        kvm@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 S:     Supported
+F:     Documentation/virt/kvm/s390*
 F:     arch/s390/include/uapi/asm/kvm*
 F:     arch/s390/include/asm/gmap.h
 F:     arch/s390/include/asm/kvm*
@@ -9275,10 +9373,10 @@ L:      keyrings@vger.kernel.org
 S:     Supported
 F:     Documentation/security/keys/trusted-encrypted.rst
 F:     include/keys/trusted-type.h
-F:     security/keys/trusted.c
-F:     include/keys/trusted.h
+F:     include/keys/trusted_tpm.h
+F:     security/keys/trusted-keys/
 
-KEYS/KEYRINGS:
+KEYS/KEYRINGS
 M:     David Howells <dhowells@redhat.com>
 M:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 L:     keyrings@vger.kernel.org
@@ -9351,6 +9449,8 @@ F:        include/net/l3mdev.h
 L7 BPF FRAMEWORK
 M:     John Fastabend <john.fastabend@gmail.com>
 M:     Daniel Borkmann <daniel@iogearbox.net>
+M:     Jakub Sitnicki <jakub@cloudflare.com>
+M:     Lorenz Bauer <lmb@cloudflare.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -9358,6 +9458,7 @@ F:        include/linux/skmsg.h
 F:     net/core/skmsg.c
 F:     net/core/sock_map.c
 F:     net/ipv4/tcp_bpf.c
+F:     net/ipv4/udp_bpf.c
 
 LANTIQ / INTEL Ethernet drivers
 M:     Hauke Mehrtens <hauke@hauke-m.de>
@@ -9386,7 +9487,7 @@ LASI 53c700 driver for PARISC
 M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
-F:     Documentation/scsi/53c700.txt
+F:     Documentation/scsi/53c700.rst
 F:     drivers/scsi/53c700*
 
 LEAKING_ADDRESSES
@@ -9569,6 +9670,7 @@ F:        drivers/acpi/nfit/*
 F:     include/linux/nd.h
 F:     include/linux/libnvdimm.h
 F:     include/uapi/linux/ndctl.h
+F:     tools/testing/nvdimm/
 
 LICENSES and SPDX stuff
 M:     Thomas Gleixner <tglx@linutronix.de>
@@ -9593,17 +9695,16 @@ F:      include/uapi/linux/lightnvm.h
 
 LINUX FOR POWER MACINTOSH
 M:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
-W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
-S:     Maintained
+S:     Odd Fixes
 F:     arch/powerpc/platforms/powermac/
 F:     drivers/macintosh/
 
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
-M:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
-M:     Paul Mackerras <paulus@samba.org>
 M:     Michael Ellerman <mpe@ellerman.id.au>
-W:     https://github.com/linuxppc/linux/wiki
+R:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
+R:     Paul Mackerras <paulus@samba.org>
+W:     https://github.com/linuxppc/wiki/wiki
 L:     linuxppc-dev@lists.ozlabs.org
 Q:     http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
@@ -9620,6 +9721,8 @@ F:        drivers/crypto/vmx/
 F:     drivers/i2c/busses/i2c-opal.c
 F:     drivers/net/ethernet/ibm/ibmveth.*
 F:     drivers/net/ethernet/ibm/ibmvnic.*
+F:     drivers/*/*/*pasemi*
+F:     drivers/*/*pasemi*
 F:     drivers/pci/hotplug/pnv_php.c
 F:     drivers/pci/hotplug/rpa*
 F:     drivers/rtc/rtc-opal.c
@@ -9636,51 +9739,31 @@ N:      pseries
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:     Anatolij Gustschin <agust@denx.de>
 L:     linuxppc-dev@lists.ozlabs.org
-T:     git git://git.denx.de/linux-denx-agust.git
-S:     Maintained
+S:     Odd Fixes
 F:     arch/powerpc/platforms/512x/
 F:     arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
-M:     Alistair Popple <alistair@popple.id.au>
-M:     Matt Porter <mporter@kernel.crashing.org>
-W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
-S:     Maintained
+S:     Orphan
 F:     arch/powerpc/platforms/40x/
 F:     arch/powerpc/platforms/44x/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 M:     Scott Wood <oss@buserror.net>
-M:     Kumar Gala <galak@kernel.crashing.org>
-W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
-S:     Maintained
+S:     Odd fixes
 F:     arch/powerpc/platforms/83xx/
 F:     arch/powerpc/platforms/85xx/
 F:     Documentation/devicetree/bindings/powerpc/fsl/
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
-M:     Vitaly Bordug <vitb@kernel.crashing.org>
-W:     http://www.penguinppc.org/
+M:     Christophe Leroy <christophe.leroy@c-s.fr>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/platforms/8xx/
 
-LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
-L:     linuxppc-dev@lists.ozlabs.org
-S:     Orphan
-F:     arch/powerpc/*/*virtex*
-F:     arch/powerpc/*/*/*virtex*
-
-LINUX FOR POWERPC PA SEMI PWRFICIENT
-L:     linuxppc-dev@lists.ozlabs.org
-S:     Orphan
-F:     arch/powerpc/platforms/pasemi/
-F:     drivers/*/*pasemi*
-F:     drivers/*/*/*pasemi*
-
 LINUX KERNEL DUMP TEST MODULE (LKDTM)
 M:     Kees Cook <keescook@chromium.org>
 S:     Maintained
@@ -10016,6 +10099,7 @@ F:      Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
 MARVELL CRYPTO DRIVER
 M:     Boris Brezillon <bbrezillon@kernel.org>
 M:     Arnaud Ebalard <arno@natisbad.org>
+M:     Srujana Challa <schalla@marvell.com>
 F:     drivers/crypto/marvell/
 S:     Maintained
 L:     linux-crypto@vger.kernel.org
@@ -10088,6 +10172,13 @@ M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
 F:     drivers/mmc/host/mvsdio.*
 
+MARVELL USB MDIO CONTROLLER DRIVER
+M:     Tobias Waldekranz <tobias@waldekranz.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/phy/mdio-mvusb.c
+F:     Documentation/devicetree/bindings/net/marvell,mvusb.yaml
+
 MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
 M:     Hu Ziji <huziji@marvell.com>
 L:     linux-mmc@vger.kernel.org
@@ -10163,7 +10254,7 @@ MAXBOTIX ULTRASONIC RANGER IIO DRIVER
 M:     Andreas Klinger <ak@it-klinger.de>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
+F:     Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
 F:     drivers/iio/proximity/mb1232.c
 
 MAXIM MAX77650 PMIC MFD DRIVER
@@ -10230,11 +10321,18 @@ M:    Dan Murphy <dmurphy@ti.com>
 M:     Sriram Dash <sriram.dash@samsung.com>
 L:     linux-can@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/net/can/m_can.txt
+F:     Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
 F:     drivers/net/can/m_can/m_can.c
 F:     drivers/net/can/m_can/m_can.h
 F:     drivers/net/can/m_can/m_can_platform.c
 
+MCP2221A MICROCHIP USB-HID TO I2C BRIDGE DRIVER
+M:     Rishi Gupta <gupt21@gmail.com>
+L:     linux-i2c@vger.kernel.org
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-mcp2221.c
+
 MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-iio@vger.kernel.org
@@ -10434,7 +10532,7 @@ L:      linux-renesas-soc@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Supported
 F:     Documentation/devicetree/bindings/media/renesas,csi2.yaml
-F:     Documentation/devicetree/bindings/media/renesas,vin.txt
+F:     Documentation/devicetree/bindings/media/renesas,vin.yaml
 F:     drivers/media/platform/rcar-vin/
 
 MEDIA DRIVERS FOR RENESAS - VSP1
@@ -10466,7 +10564,7 @@ M:      Hugues Fruchet <hugues.fruchet@st.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Supported
-F:     Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
+F:     Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
 F:     drivers/media/platform/stm32/stm32-dcmi.c
 
 MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
@@ -10639,7 +10737,7 @@ L:      megaraidlinux.pdl@broadcom.com
 L:     linux-scsi@vger.kernel.org
 W:     http://www.avagotech.com/support/
 S:     Maintained
-F:     Documentation/scsi/megaraid.txt
+F:     Documentation/scsi/megaraid.rst
 F:     drivers/scsi/megaraid.*
 F:     drivers/scsi/megaraid/
 
@@ -10891,6 +10989,16 @@ M:     Vladimir Vid <vladimir.vid@sartura.hr>
 S:     Maintained
 F:     arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 
+MHI BUS
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Hemant Kumar <hemantk@codeaurora.org>
+L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
+F:     Documentation/mhi/
+F:     drivers/bus/mhi/
+F:     include/linux/mhi.h
+
 MICROBLAZE ARCHITECTURE
 M:     Michal Simek <monstr@monstr.eu>
 W:     http://www.monstr.eu/fdt/
@@ -10944,6 +11052,7 @@ F:      drivers/media/platform/atmel/atmel-isc.h
 F:     drivers/media/platform/atmel/atmel-isc-base.c
 F:     drivers/media/platform/atmel/atmel-isc-regs.h
 F:     Documentation/devicetree/bindings/media/atmel-isc.txt
+F:     include/linux/atmel-isc-media.h
 
 MICROCHIP ISI DRIVER
 M:     Eugen Hristev <eugen.hristev@microchip.com>
@@ -11092,7 +11201,7 @@ F:      drivers/scsi/smartpqi/Kconfig
 F:     drivers/scsi/smartpqi/Makefile
 F:     include/linux/cciss*.h
 F:     include/uapi/linux/cciss*.h
-F:     Documentation/scsi/smartpqi.txt
+F:     Documentation/scsi/smartpqi.rst
 
 MICROSEMI ETHERNET SWITCH DRIVER
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
@@ -11114,14 +11223,12 @@ S:    Maintained
 F:     drivers/usb/image/microtek.*
 
 MIPS
-M:     Ralf Baechle <ralf@linux-mips.org>
-M:     Paul Burton <paulburton@kernel.org>
+M:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 L:     linux-mips@vger.kernel.org
 W:     http://www.linux-mips.org/
-T:     git git://git.linux-mips.org/pub/scm/ralf/linux.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
-Q:     http://patchwork.linux-mips.org/project/linux-mips/list/
-S:     Supported
+Q:     https://patchwork.kernel.org/project/linux-mips/list/
+S:     Maintained
 F:     Documentation/devicetree/bindings/mips/
 F:     Documentation/mips/
 F:     arch/mips/
@@ -11171,6 +11278,7 @@ S:      Maintained
 F:     arch/mips/loongson64/
 F:     arch/mips/include/asm/mach-loongson64/
 F:     drivers/platform/mips/cpu_hwmon.c
+F:     drivers/irqchip/irq-loongson*
 F:     drivers/*/*loongson3*
 F:     drivers/*/*/*loongson3*
 
@@ -11259,7 +11367,8 @@ F:      drivers/tty/mxser.*
 MONOLITHIC POWER SYSTEM PMIC DRIVER
 M:     Saravanan Sekar <sravanhome@gmail.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/regulator/mpq7920.yaml
+F:     Documentation/devicetree/bindings/regulator/mps,mp*.yaml
+F:     drivers/regulator/mp5416.c
 F:     drivers/regulator/mpq7920.c
 F:     drivers/regulator/mpq7920.h
 
@@ -11453,6 +11562,7 @@ L:      linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
+C:     irc://irc.oftc.net/mtd
 S:     Maintained
 F:     drivers/mtd/nand/
 F:     include/linux/mtd/*nand*.h
@@ -11473,7 +11583,7 @@ M:      Finn Thain <fthain@telegraphics.com.au>
 M:     Michael Schmitz <schmitzmic@gmail.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
-F:     Documentation/scsi/g_NCR5380.txt
+F:     Documentation/scsi/g_NCR5380.rst
 F:     drivers/scsi/NCR5380.*
 F:     drivers/scsi/arm/cumana_1.c
 F:     drivers/scsi/arm/oak.c
@@ -11484,7 +11594,7 @@ F:      drivers/scsi/mac_scsi.*
 F:     drivers/scsi/sun3_scsi.*
 F:     drivers/scsi/sun3_scsi_vme.c
 
-NCSI LIBRARY:
+NCSI LIBRARY
 M:     Samuel Mendoza-Jonas <sam@mendozajonas.com>
 S:     Maintained
 F:     net/ncsi/
@@ -11703,6 +11813,7 @@ W:      https://github.com/multipath-tcp/mptcp_net-next/wiki
 B:     https://github.com/multipath-tcp/mptcp_net-next/issues
 S:     Maintained
 F:     include/net/mptcp.h
+F:     include/uapi/linux/mptcp.h
 F:     net/mptcp/
 F:     tools/testing/selftests/net/mptcp/
 
@@ -11791,7 +11902,7 @@ W:      https://nilfs.sourceforge.io/
 W:     https://nilfs.osdn.jp/
 T:     git git://github.com/konis/nilfs2.git
 S:     Supported
-F:     Documentation/filesystems/nilfs2.txt
+F:     Documentation/filesystems/nilfs2.rst
 F:     fs/nilfs2/
 F:     include/trace/events/nilfs2.h
 F:     include/uapi/linux/nilfs2_api.h
@@ -11801,7 +11912,7 @@ NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
 M:     YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
 W:     http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
 S:     Maintained
-F:     Documentation/scsi/NinjaSCSI.txt
+F:     Documentation/scsi/NinjaSCSI.rst
 F:     drivers/scsi/pcmcia/nsp_*
 
 NINJA SCSI-32Bi/UDE PCI/CARDBUS SCSI HOST ADAPTER DRIVER
@@ -11809,7 +11920,7 @@ M:      GOTO Masanori <gotom@debian.or.jp>
 M:     YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
 W:     http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
 S:     Maintained
-F:     Documentation/scsi/NinjaSCSI.txt
+F:     Documentation/scsi/NinjaSCSI.rst
 F:     drivers/scsi/nsp32*
 
 NIOS2 ARCHITECTURE
@@ -11861,6 +11972,7 @@ F:      scripts/nsdeps
 F:     Documentation/core-api/symbol-namespaces.rst
 
 NTB AMD DRIVER
+M:     Sanjay R Mehta <sanju.mehta@amd.com>
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     linux-ntb@googlegroups.com
 S:     Supported
@@ -11900,7 +12012,7 @@ L:      linux-ntfs-dev@lists.sourceforge.net
 W:     http://www.tuxera.com/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
 S:     Supported
-F:     Documentation/filesystems/ntfs.txt
+F:     Documentation/filesystems/ntfs.rst
 F:     fs/ntfs/
 
 NUBUS SUBSYSTEM
@@ -12246,7 +12358,7 @@ OMFS FILESYSTEM
 M:     Bob Copeland <me@bobcopeland.com>
 L:     linux-karma-devel@lists.sourceforge.net
 S:     Maintained
-F:     Documentation/filesystems/omfs.txt
+F:     Documentation/filesystems/omfs.rst
 F:     fs/omfs/
 
 OMNIKEY CARDMAN 4000 DRIVER
@@ -12418,7 +12530,6 @@ F:      Documentation/ABI/testing/sysfs-firmware-ofw
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 M:     Rob Herring <robh+dt@kernel.org>
-M:     Mark Rutland <mark.rutland@arm.com>
 L:     devicetree@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 Q:     http://patchwork.ozlabs.org/project/devicetree-bindings/list/
@@ -12495,8 +12606,8 @@ M:      Joseph Qi <joseph.qi@linux.alibaba.com>
 L:     ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:     http://ocfs2.wiki.kernel.org
 S:     Supported
-F:     Documentation/filesystems/ocfs2.txt
-F:     Documentation/filesystems/dlmfs.txt
+F:     Documentation/filesystems/ocfs2.rst
+F:     Documentation/filesystems/dlmfs.rst
 F:     fs/ocfs2/
 
 ORANGEFS FILESYSTEM
@@ -12506,7 +12617,7 @@ L:      devel@lists.orangefs.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 S:     Supported
 F:     fs/orangefs/
-F:     Documentation/filesystems/orangefs.txt
+F:     Documentation/filesystems/orangefs.rst
 
 ORINOCO DRIVER
 L:     linux-wireless@vger.kernel.org
@@ -12540,16 +12651,6 @@ W:     http://wireless.kernel.org/en/users/Drivers/p54
 S:     Maintained
 F:     drivers/net/wireless/intersil/p54/
 
-PA SEMI ETHERNET DRIVER
-L:     netdev@vger.kernel.org
-S:     Orphan
-F:     drivers/net/ethernet/pasemi/*
-
-PA SEMI SMBUS DRIVER
-L:     linux-i2c@vger.kernel.org
-S:     Orphan
-F:     drivers/i2c/busses/i2c-pasemi.c
-
 PACKING
 M:     Vladimir Oltean <olteanv@gmail.com>
 L:     netdev@vger.kernel.org
@@ -12739,8 +12840,8 @@ PCI DRIVER FOR CADENCE PCIE IP
 M:     Tom Joseph <tjoseph@cadence.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/cdns,*.txt
-F:     drivers/pci/controller/pcie-cadence*
+F:     Documentation/devicetree/bindings/pci/cdns,*
+F:     drivers/pci/controller/cadence/
 
 PCI DRIVER FOR FREESCALE LAYERSCAPE
 M:     Minghuan Lian <minghuan.Lian@nxp.com>
@@ -12752,6 +12853,14 @@ L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
 F:     drivers/pci/controller/dwc/*layerscape*
 
+PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER
+M:     Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
+F:     drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c
+
 PCI DRIVER FOR GENERIC OF HOSTS
 M:     Will Deacon <will@kernel.org>
 L:     linux-pci@vger.kernel.org
@@ -12794,7 +12903,7 @@ M:      Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
-F:     drivers/pci/controller/pcie-mobiveil.c
+F:     drivers/pci/controller/mobiveil/pcie-mobiveil*
 
 PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 M:     Thomas Petazzoni <thomas.petazzoni@bootlin.com>
@@ -12953,7 +13062,6 @@ M:      Robert Richter <rrichter@marvell.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
-F:     Documentation/devicetree/bindings/pci/pci-thunder-*
 F:     drivers/pci/controller/pci-thunder-*
 
 PCIE DRIVER FOR HISILICON
@@ -13160,6 +13268,7 @@ S:      Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 F:     samples/pidfd/
 F:     tools/testing/selftests/pidfd/
+F:     tools/testing/selftests/pid_namespace/
 F:     tools/testing/selftests/clone3/
 K:     (?i)pidfd
 K:     (?i)clone3
@@ -13168,21 +13277,13 @@ K:    \b(clone_args|kernel_clone_args)\b
 PIN CONTROL SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-gpio@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 F:     Documentation/devicetree/bindings/pinctrl/
 F:     Documentation/driver-api/pinctl.rst
 F:     drivers/pinctrl/
 F:     include/linux/pinctrl/
 
-PIN CONTROLLER - MICROCHIP AT91
-M:     Ludovic Desroches <ludovic.desroches@microchip.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     linux-gpio@vger.kernel.org
-S:     Supported
-F:     drivers/pinctrl/pinctrl-at91*
-F:     drivers/gpio/gpio-sama5d2-piobu.c
-
 PIN CONTROLLER - FREESCALE
 M:     Dong Aisheng <aisheng.dong@nxp.com>
 M:     Fabio Estevam <festevam@gmail.com>
@@ -13191,14 +13292,14 @@ M:    Stefan Agner <stefan@agner.ch>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
-F:     drivers/pinctrl/freescale/
 F:     Documentation/devicetree/bindings/pinctrl/fsl,*
+F:     drivers/pinctrl/freescale/
 
 PIN CONTROLLER - INTEL
 M:     Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Andy Shevchenko <andy@kernel.org>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
 F:     drivers/pinctrl/intel/
 
 PIN CONTROLLER - MEDIATEK
@@ -13209,18 +13310,26 @@ F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
 F:     Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
 F:     drivers/pinctrl/mediatek/
 
+PIN CONTROLLER - MICROCHIP AT91
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-gpio@vger.kernel.org
+S:     Supported
+F:     drivers/gpio/gpio-sama5d2-piobu.c
+F:     drivers/pinctrl/pinctrl-at91*
+
 PIN CONTROLLER - QUALCOMM
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
-S:     Maintained
 L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/qcom,*.txt
 F:     drivers/pinctrl/qcom/
 
 PIN CONTROLLER - RENESAS
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 L:     linux-renesas-soc@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 F:     drivers/pinctrl/pinctrl-rz*
 F:     drivers/pinctrl/sh-pfc/
 
@@ -13230,12 +13339,12 @@ M:    Krzysztof Kozlowski <krzk@kernel.org>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
-Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
+Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
+F:     Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 F:     drivers/pinctrl/samsung/
 F:     include/dt-bindings/pinctrl/samsung.h
-F:     Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 
 PIN CONTROLLER - SINGLE
 M:     Tony Lindgren <tony@atomide.com>
@@ -13248,8 +13357,8 @@ F:      drivers/pinctrl/pinctrl-single.c
 PIN CONTROLLER - ST SPEAR
 M:     Viresh Kumar <vireshk@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.st.com/spear
 S:     Maintained
+W:     http://www.st.com/spear
 F:     drivers/pinctrl/spear/
 
 PISTACHIO SOC SUPPORT
@@ -13349,7 +13458,9 @@ F:      Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
 
 PNP SUPPORT
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+L:     linux-acpi@vger.kernel.org
 S:     Maintained
+F:     include/linux/pnp.h
 F:     drivers/pnp/
 
 POSIX CLOCKS and TIMERS
@@ -13469,7 +13580,7 @@ S:      Maintained
 F:     fs/proc/
 F:     include/linux/proc_fs.h
 F:     tools/testing/selftests/proc/
-F:     Documentation/filesystems/proc.txt
+F:     Documentation/filesystems/proc.rst
 
 PROC SYSCTL
 M:     Luis Chamberlain <mcgrof@kernel.org>
@@ -13512,13 +13623,19 @@ L:    linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/block/ps3vram.c
 
-PSAMPLE PACKET SAMPLING SUPPORT:
+PSAMPLE PACKET SAMPLING SUPPORT
 M:     Yotam Gigi <yotam.gi@gmail.com>
 S:     Maintained
 F:     net/psample
 F:     include/net/psample.h
 F:     include/uapi/linux/psample.h
 
+PRESSURE STALL INFORMATION (PSI)
+M:     Johannes Weiner <hannes@cmpxchg.org>
+S:     Maintained
+F:     kernel/sched/psi.c
+F:     include/linux/psi*
+
 PSTORE FILESYSTEM
 M:     Kees Cook <keescook@chromium.org>
 M:     Anton Vorontsov <anton@enomsg.org>
@@ -13663,6 +13780,12 @@ L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
 F:     sound/soc/qcom/
 
+QCOM IPA DRIVER
+M:     Alex Elder <elder@kernel.org>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ipa/
+
 QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 M:     Gabriel Somlo <somlo@cmu.edu>
 M:     "Michael S. Tsirkin" <mst@redhat.com>
@@ -13898,6 +14021,7 @@ L:      linux-arm-msm@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/platform/qcom/venus/
+F:     Documentation/devicetree/bindings/media/*venus*
 
 QUALCOMM WCN36XX WIRELESS DRIVER
 M:     Kalle Valo <kvalo@codeaurora.org>
@@ -14073,6 +14197,7 @@ S:      Supported
 F:     arch/x86/kernel/cpu/resctrl/
 F:     arch/x86/include/asm/resctrl_sched.h
 F:     Documentation/x86/resctrl*
+F:     tools/testing/selftests/resctrl/
 
 READ-COPY UPDATE (RCU)
 M:     "Paul E. McKenney" <paulmck@kernel.org>
@@ -14228,7 +14353,7 @@ F:      include/dt-bindings/reset/
 F:     include/linux/reset.h
 F:     include/linux/reset/
 F:     include/linux/reset-controller.h
-K:      \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
+K:     \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
 
 RESTARTABLE SEQUENCES SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -14312,9 +14437,12 @@ F:     Documentation/devicetree/bindings/media/rockchip-rga.txt
 
 HANTRO VPU CODEC DRIVER
 M:     Ezequiel Garcia <ezequiel@collabora.com>
+M:     Philipp Zabel <p.zabel@pengutronix.de>
 L:     linux-media@vger.kernel.org
+L:     linux-rockchip@lists.infradead.org
 S:     Maintained
 F:     drivers/staging/media/hantro/
+F:     Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
 F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
 
 ROCKER DRIVER
@@ -14361,6 +14489,14 @@ F:     include/net/rose.h
 F:     include/uapi/linux/rose.h
 F:     net/rose/
 
+ROTATION DRIVER FOR ALLWINNER A83T
+M:     Jernej Skrabec <jernej.skrabec@siol.net>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/platform/sunxi/sun8i-rotate/
+F:     Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
+
 RTL2830 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -14461,7 +14597,7 @@ F:      Documentation/s390/
 F:     Documentation/driver-api/s390-drivers.rst
 
 S390 COMMON I/O LAYER
-M:     Sebastian Ott <sebott@linux.ibm.com>
+M:     Vineeth Vijayan <vneethv@linux.ibm.com>
 M:     Peter Oberparleiter <oberpar@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -14503,7 +14639,7 @@ S:      Supported
 F:     drivers/s390/net/
 
 S390 PCI SUBSYSTEM
-M:     Sebastian Ott <sebott@linux.ibm.com>
+M:     Niklas Schnelle <schnelle@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@de.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -14582,10 +14718,10 @@ F:    drivers/media/pci/saa7146/
 F:     include/media/drv-intf/saa7146*
 
 SAFESETID SECURITY MODULE
-M:     Micah Morton <mortonm@chromium.org>
-S:     Supported
-F:     security/safesetid/
-F:     Documentation/admin-guide/LSM/SafeSetID.rst
+M:     Micah Morton <mortonm@chromium.org>
+S:     Supported
+F:     security/safesetid/
+F:     Documentation/admin-guide/LSM/SafeSetID.rst
 
 SAMSUNG AUDIO (ASoC) DRIVERS
 M:     Krzysztof Kozlowski <krzk@kernel.org>
@@ -14797,7 +14933,7 @@ M:      Doug Gilbert <dgilbert@interlog.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://sg.danny.cz/sg
 S:     Maintained
-F:     Documentation/scsi/scsi-generic.txt
+F:     Documentation/scsi/scsi-generic.rst
 F:     drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
@@ -14817,7 +14953,7 @@ SCSI TAPE DRIVER
 M:     Kai Mäkisara <Kai.Makisara@kolumbus.fi>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
-F:     Documentation/scsi/st.txt
+F:     Documentation/scsi/st.rst
 F:     drivers/scsi/st.*
 F:     drivers/scsi/st_*.h
 
@@ -14974,7 +15110,7 @@ X:      security/selinux/
 
 SELINUX SECURITY MODULE
 M:     Paul Moore <paul@paul-moore.com>
-M:     Stephen Smalley <sds@tycho.nsa.gov>
+M:     Stephen Smalley <stephen.smalley.work@gmail.com>
 M:     Eric Paris <eparis@parisplace.org>
 L:     selinux@vger.kernel.org
 W:     https://selinuxproject.org
@@ -14986,6 +15122,7 @@ F:      security/selinux/
 F:     scripts/selinux/
 F:     Documentation/admin-guide/LSM/SELinux.rst
 F:     Documentation/ABI/obsolete/sysfs-selinux-disable
+F:     Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
 
 SENSABLE PHANTOM
 M:     Jiri Slaby <jirislaby@gmail.com>
@@ -15003,7 +15140,7 @@ SERIAL DEVICE BUS
 M:     Rob Herring <robh@kernel.org>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/serial/slave-device.txt
+F:     Documentation/devicetree/bindings/serial/serial.yaml
 F:     drivers/tty/serdev/
 F:     include/linux/serdev.h
 
@@ -15043,14 +15180,6 @@ M:     Dimitri Sivanich <sivanich@sgi.com>
 S:     Maintained
 F:     drivers/misc/sgi-gru/
 
-SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
-M:     Pat Gefre <pfg@sgi.com>
-L:     linux-ia64@vger.kernel.org
-S:     Supported
-F:     Documentation/ia64/serial.rst
-F:     drivers/tty/serial/ioc?_serial.c
-F:     include/linux/ioc?.h
-
 SGI XP/XPC/XPNET DRIVER
 M:     Cliff Whickman <cpw@sgi.com>
 M:     Robin Holt <robinmholt@gmail.com>
@@ -15065,6 +15194,14 @@ W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     net/smc/
 
+SHARP GP2AP002A00F/GP2AP002S00F SENSOR DRIVER
+M:     Linus Walleij <linus.walleij@linaro.org>
+L:     linux-iio@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
+S:     Maintained
+F:     drivers/iio/light/gp2ap002.c
+F:     Documentation/devicetree/bindings/iio/light/sharp,gp2ap002.yaml
+
 SHARP RJ54N1CB0C SENSOR DRIVER
 M:     Jacopo Mondi <jacopo@jmondi.org>
 L:     linux-media@vger.kernel.org
@@ -15331,11 +15468,10 @@ S:    Odd Fixes
 F:     drivers/net/ethernet/smsc/smc91x.*
 
 SMIA AND SMIA++ IMAGE SENSOR DRIVER
-M:     Sakari Ailus <sakari.ailus@iki.fi>
+M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/smiapp/
-F:     include/media/i2c/smiapp.h
 F:     drivers/media/i2c/smiapp-pll.c
 F:     drivers/media/i2c/smiapp-pll.h
 F:     include/uapi/linux/smiapp.h
@@ -15420,11 +15556,9 @@ F:     drivers/infiniband/sw/siw/
 F:     include/uapi/rdma/siw-abi.h
 
 SOFT-ROCE DRIVER (rxe)
-M:     Moni Shoua <monis@mellanox.com>
+M:     Zhu Yanjun <yanjunz@mellanox.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
-W:     https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
-Q:     http://patchwork.kernel.org/project/linux-rdma/list/
 F:     drivers/infiniband/sw/rxe/
 F:     include/uapi/rdma/rdma_user_rxe.h
 
@@ -15516,6 +15650,14 @@ S:     Maintained
 F:     drivers/media/i2c/imx214.c
 F:     Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
 
+SONY IMX219 SENSOR DRIVER
+M:     Dave Stevenson <dave.stevenson@raspberrypi.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/imx219.c
+F:     Documentation/devicetree/bindings/media/i2c/imx219.yaml
+
 SONY IMX258 SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
@@ -15566,8 +15708,8 @@ F:      include/linux/memstick.h
 SONY VAIO CONTROL DEVICE DRIVER
 M:     Mattia Dongili <malattia@linux.it>
 L:     platform-driver-x86@vger.kernel.org
-W:     http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
 S:     Maintained
+W:     http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
 F:     Documentation/admin-guide/laptops/sony-laptop.rst
 F:     drivers/char/sonypi.c
 F:     drivers/platform/x86/sony-laptop.c
@@ -15617,6 +15759,17 @@ F:     sound/soc/
 F:     include/dt-bindings/sound/
 F:     include/sound/soc*
 
+SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
+M:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+M:     Liam Girdwood <lgirdwood@gmail.com>
+M:     Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
+M:     Kai Vehmanen <kai.vehmanen@linux.intel.com>
+M:     Daniel Baluta <daniel.baluta@nxp.com>
+L:     sound-open-firmware@alsa-project.org (moderated for non-subscribers)
+W:     https://github.com/thesofproject/linux/
+S:     Supported
+F:     sound/soc/sof/
+
 SOUNDWIRE SUBSYSTEM
 M:     Vinod Koul <vkoul@kernel.org>
 M:     Sanyog Kale <sanyog.r.kale@intel.com>
@@ -15691,6 +15844,7 @@ L:      linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next
+C:     irc://irc.oftc.net/mtd
 S:     Maintained
 F:     drivers/mtd/spi-nor/
 F:     include/linux/mtd/spi-nor.h
@@ -15738,7 +15892,7 @@ L:      squashfs-devel@lists.sourceforge.net (subscribers-only)
 W:     http://squashfs.org.uk
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
 S:     Maintained
-F:     Documentation/filesystems/squashfs.txt
+F:     Documentation/filesystems/squashfs.rst
 F:     fs/squashfs/
 
 SRM (Alpha) environment access
@@ -15923,8 +16077,7 @@ F:      drivers/*/stm32-*timer*
 F:     drivers/pwm/pwm-stm32*
 F:     include/linux/*/stm32-*tim*
 F:     Documentation/ABI/testing/*timer-stm32
-F:     Documentation/devicetree/bindings/*/stm32-*timer*
-F:     Documentation/devicetree/bindings/pwm/pwm-stm32*
+F:     Documentation/devicetree/bindings/*/*stm32-*timer*
 
 STMMAC ETHERNET DRIVER
 M:     Giuseppe Cavallaro <peppe.cavallaro@st.com>
@@ -16075,20 +16228,22 @@ F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
 SYNOPSYS CREG GPIO DRIVER
 M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 S:     Maintained
-F:     drivers/gpio/gpio-creg-snps.c
 F:     Documentation/devicetree/bindings/gpio/snps,creg-gpio.txt
+F:     drivers/gpio/gpio-creg-snps.c
 
 SYNOPSYS DESIGNWARE 8250 UART DRIVER
 R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 S:     Maintained
 F:     drivers/tty/serial/8250/8250_dw.c
+F:     drivers/tty/serial/8250/8250_dwlib.*
+F:     drivers/tty/serial/8250/8250_lpss.c
 
 SYNOPSYS DESIGNWARE APB GPIO DRIVER
 M:     Hoan Tran <hoan@os.amperecomputing.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
-F:     drivers/gpio/gpio-dwapb.c
 F:     Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
+F:     drivers/gpio/gpio-dwapb.c
 
 SYNOPSYS DESIGNWARE AXI DMAC DRIVER
 M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
@@ -16112,6 +16267,13 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/synopsys/
 
+SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER
+M:     Jose Abreu <Jose.Abreu@synopsys.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/phy/mdio-xpcs.c
+F:     include/linux/mdio-xpcs.h
+
 SYNOPSYS DESIGNWARE I2C DRIVER
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
 R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -16181,7 +16343,7 @@ F:      drivers/platform/x86/system76_acpi.c
 SYSV FILESYSTEM
 M:     Christoph Hellwig <hch@infradead.org>
 S:     Maintained
-F:     Documentation/filesystems/sysv-fs.txt
+F:     Documentation/filesystems/sysv-fs.rst
 F:     fs/sysv/
 F:     include/linux/sysv_fs.h
 
@@ -16540,10 +16702,10 @@ THINKPAD ACPI EXTRAS DRIVER
 M:     Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 L:     ibm-acpi-devel@lists.sourceforge.net
 L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
 W:     http://ibm-acpi.sourceforge.net
 W:     http://thinkwiki.org/wiki/Ibm-acpi
 T:     git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
-S:     Maintained
 F:     drivers/platform/x86/thinkpad_acpi.c
 
 THUNDERBOLT DRIVER
@@ -16552,8 +16714,8 @@ M:      Michael Jamet <michael.jamet@intel.com>
 M:     Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Yehezkel Bernat <YehezkelShB@gmail.com>
 L:     linux-usb@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
 F:     Documentation/admin-guide/thunderbolt.rst
 F:     drivers/thunderbolt/
 F:     include/linux/thunderbolt.h
@@ -16747,12 +16909,12 @@ F:    sound/soc/codecs/twl4030*
 TI VPE/CAL DRIVERS
 M:     Benoit Parrot <bparrot@ti.com>
 L:     linux-media@vger.kernel.org
+S:     Maintained
 W:     http://linuxtv.org/
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
-S:     Maintained
-F:     drivers/media/platform/ti-vpe/
+F:     Documentation/devicetree/bindings/media/ti,cal.yaml
 F:     Documentation/devicetree/bindings/media/ti,vpe.yaml
-       Documentation/devicetree/bindings/media/ti,cal.yaml
+F:     drivers/media/platform/ti-vpe/
 
 TI WILINK WIRELESS DRIVERS
 L:     linux-wireless@vger.kernel.org
@@ -17039,6 +17201,18 @@ W:     http://linuxtv.org
 S:     Maintained
 F:     drivers/media/pci/tw686x/
 
+UACCE ACCELERATOR FRAMEWORK
+M:     Zhangfei Gao <zhangfei.gao@linaro.org>
+M:     Zhou Wang <wangzhou1@hisilicon.com>
+L:     linux-accelerators@lists.ozlabs.org
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-driver-uacce
+F:     Documentation/misc-devices/uacce.rst
+F:     drivers/misc/uacce/
+F:     include/linux/uacce.h
+F:     include/uapi/misc/uacce/
+
 UBI FILE SYSTEM (UBIFS)
 M:     Richard Weinberger <richard@nod.at>
 L:     linux-mtd@lists.infradead.org
@@ -17046,7 +17220,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
 W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
 S:     Supported
-F:     Documentation/filesystems/ubifs.txt
+F:     Documentation/filesystems/ubifs.rst
 F:     fs/ubifs/
 
 UCLINUX (M68KNOMMU AND COLDFIRE)
@@ -17065,7 +17239,7 @@ F:      arch/m68k/include/asm/*_no.*
 UDF FILESYSTEM
 M:     Jan Kara <jack@suse.com>
 S:     Maintained
-F:     Documentation/filesystems/udf.txt
+F:     Documentation/filesystems/udf.rst
 F:     fs/udf/
 
 UDRAW TABLET
@@ -17080,7 +17254,7 @@ S:      Maintained
 F:     Documentation/admin-guide/ufs.rst
 F:     fs/ufs/
 
-UHID USERSPACE HID IO DRIVER:
+UHID USERSPACE HID IO DRIVER
 M:     David Herrmann <dh.herrmann@googlemail.com>
 L:     linux-input@vger.kernel.org
 S:     Maintained
@@ -17094,18 +17268,13 @@ S:    Maintained
 F:     drivers/usb/common/ulpi.c
 F:     include/linux/ulpi/
 
-ULTRA-WIDEBAND (UWB) SUBSYSTEM:
-L:     devel@driverdev.osuosl.org
-S:     Obsolete
-F:     drivers/staging/uwb/
-
-UNICODE SUBSYSTEM:
+UNICODE SUBSYSTEM
 M:     Gabriel Krisman Bertazi <krisman@collabora.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Supported
 F:     fs/unicode/
 
-UNICORE32 ARCHITECTURE:
+UNICORE32 ARCHITECTURE
 M:     Guan Xuetao <gxt@pku.edu.cn>
 W:     http://mprc.pku.edu.cn/~guanxuetao/linux
 S:     Maintained
@@ -17140,7 +17309,7 @@ R:      Alim Akhtar <alim.akhtar@samsung.com>
 R:     Avri Altman <avri.altman@wdc.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
-F:     Documentation/scsi/ufs.txt
+F:     Documentation/scsi/ufs.rst
 F:     drivers/scsi/ufs/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
@@ -17182,6 +17351,12 @@ S:     Maintained
 F:     Documentation/usb/acm.rst
 F:     drivers/usb/class/cdc-acm.*
 
+USB APPLE MFI FASTCHARGE DRIVER
+M:     Bastien Nocera <hadess@hadess.net>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/misc/apple-mfi-fastcharge.c
+
 USB AR5523 WIRELESS DRIVER
 M:     Pontus Fuchs <pontus.fuchs@gmail.com>
 L:     linux-wireless@vger.kernel.org
@@ -17392,11 +17567,14 @@ F:    drivers/usb/
 F:     include/linux/usb.h
 F:     include/linux/usb/
 
-USB TYPEC PI3USB30532 MUX DRIVER
-M:     Hans de Goede <hdegoede@redhat.com>
+USB TYPEC BUS FOR ALTERNATE MODES
+M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     drivers/usb/typec/mux/pi3usb30532.c
+F:     Documentation/ABI/testing/sysfs-bus-typec
+F:     Documentation/driver-api/usb/typec_bus.rst
+F:     drivers/usb/typec/altmodes/
+F:     include/linux/usb/typec_altmode.h
 
 USB TYPEC CLASS
 M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
@@ -17407,14 +17585,11 @@ F:    Documentation/driver-api/usb/typec.rst
 F:     drivers/usb/typec/
 F:     include/linux/usb/typec.h
 
-USB TYPEC BUS FOR ALTERNATE MODES
-M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
+USB TYPEC PI3USB30532 MUX DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/ABI/testing/sysfs-bus-typec
-F:     Documentation/driver-api/usb/typec_bus.rst
-F:     drivers/usb/typec/altmodes/
-F:     include/linux/usb/typec_altmode.h
+F:     drivers/usb/typec/mux/pi3usb30532.c
 
 USB TYPEC PORT CONTROLLER DRIVERS
 M:     Guenter Roeck <linux@roeck-us.net>
@@ -17444,7 +17619,7 @@ L:      linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     https://linuxtv.org
 S:     Odd Fixes
-F:     drivers/media/usb/usbvision/
+F:     drivers/staging/media/usbvision/
 
 USB WEBCAM GADGET
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -17697,10 +17872,12 @@ L:    virtualization@lists.linux-foundation.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/virtio/
 F:     drivers/virtio/
+F:     drivers/vdpa/
 F:     tools/virtio/
 F:     drivers/net/virtio_net.c
 F:     drivers/block/virtio_blk.c
 F:     include/linux/virtio*.h
+F:     include/linux/vdpa.h
 F:     include/uapi/linux/virtio_*.h
 F:     drivers/crypto/virtio/
 F:     mm/balloon_compaction.c
@@ -17768,6 +17945,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
 S:     Maintained
 F:     drivers/vhost/
 F:     include/uapi/linux/vhost.h
+F:     include/linux/vhost_iotlb.h
 
 VIRTIO INPUT DRIVER
 M:     Gerd Hoffmann <kraxel@redhat.com>
@@ -17791,7 +17969,7 @@ F:      include/linux/vbox_utils.h
 F:     include/uapi/linux/vbox*.h
 F:     drivers/virt/vboxguest/
 
-VIRTUAL BOX SHARED FOLDER VFS DRIVER:
+VIRTUAL BOX SHARED FOLDER VFS DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
@@ -17853,6 +18031,13 @@ S:     Supported
 F:     arch/x86/kernel/cpu/vmware.c
 F:     arch/x86/include/asm/vmware.h
 
+VMWARE VIRTUAL PTP CLOCK DRIVER
+M:     Vivek Thampi <vithampi@vmware.com>
+M:     "VMware, Inc." <pv-drivers@vmware.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/ptp/ptp_vmw.c
+
 VMWARE PVRDMA DRIVER
 M:     Adit Ranadive <aditr@vmware.com>
 M:     VMware PV-Drivers <pv-drivers@vmware.com>
@@ -18187,10 +18372,10 @@ X86 PLATFORM DRIVERS
 M:     Darren Hart <dvhart@infradead.org>
 M:     Andy Shevchenko <andy@infradead.org>
 L:     platform-driver-x86@vger.kernel.org
-T:     git git://git.infradead.org/linux-platform-drivers-x86.git
 S:     Odd Fixes
-F:     drivers/platform/x86/
+T:     git git://git.infradead.org/linux-platform-drivers-x86.git
 F:     drivers/platform/olpc/
+F:     drivers/platform/x86/
 
 X86 PLATFORM DRIVERS - ARCH
 R:     Darren Hart <dvhart@infradead.org>
@@ -18414,8 +18599,8 @@ M:      Nandor Han <nandor.han@ge.com>
 M:     Semi Malinen <semi.malinen@ge.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
-F:     drivers/gpio/gpio-xra1403.c
 F:     Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
+F:     drivers/gpio/gpio-xra1403.c
 
 XTENSA XTFPGA PLATFORM SUPPORT
 M:     Max Filippov <jcmvbkbc@gmail.com>
@@ -18504,7 +18689,7 @@ L:      linux-fsdevel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
 S:     Maintained
 F:     fs/zonefs/
-F:     Documentation/filesystems/zonefs.txt
+F:     Documentation/filesystems/zonefs.rst
 
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>