]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - MAINTAINERS
projects / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'linux-watchdog-5.6-rc3' of git://www.linux-watchdog.org/linux-watchdog
[linux.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 2ce43a06b7b5b300b18ef5c65f1c7a13792cbf04..2af5fa73155e4dc3421b3d54b264060e973783e6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -317,30 +317,30 @@ ACPI
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Len Brown <lenb@kernel.org>
 L:     linux-acpi@vger.kernel.org
+S:     Supported
 W:     https://01.org/linux-acpi
-Q:     https://patchwork.kernel.org/project/linux-acpi/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+Q:     https://patchwork.kernel.org/project/linux-acpi/list/
 B:     https://bugzilla.kernel.org
-S:     Supported
+F:     Documentation/ABI/testing/configfs-acpi
+F:     Documentation/ABI/testing/sysfs-bus-acpi
+F:     Documentation/firmware-guide/acpi/
 F:     drivers/acpi/
+F:     drivers/pci/*/*acpi*
+F:     drivers/pci/*acpi*
 F:     drivers/pnp/pnpacpi/
+F:     include/acpi/
 F:     include/linux/acpi.h
 F:     include/linux/fwnode.h
-F:     include/acpi/
-F:     Documentation/firmware-guide/acpi/
-F:     Documentation/ABI/testing/sysfs-bus-acpi
-F:     Documentation/ABI/testing/configfs-acpi
-F:     drivers/pci/*acpi*
-F:     drivers/pci/*/*acpi*
 F:     tools/power/acpi/
 
 ACPI APEI
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Len Brown <lenb@kernel.org>
-L:     linux-acpi@vger.kernel.org
 R:     James Morse <james.morse@arm.com>
 R:     Tony Luck <tony.luck@intel.com>
 R:     Borislav Petkov <bp@alien8.de>
+L:     linux-acpi@vger.kernel.org
 F:     drivers/acpi/apei/
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
@@ -349,13 +349,13 @@ M:        Erik Kaneda <erik.kaneda@intel.com>
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 L:     linux-acpi@vger.kernel.org
 L:     devel@acpica.org
+S:     Supported
 W:     https://acpica.org/
 W:     https://github.com/acpica/acpica/
-Q:     https://patchwork.kernel.org/project/linux-acpi/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+Q:     https://patchwork.kernel.org/project/linux-acpi/list/
 B:     https://bugzilla.kernel.org
 B:     https://bugs.acpica.org
-S:     Supported
 F:     drivers/acpi/acpica/
 F:     include/acpi/
 F:     tools/power/acpi/
@@ -363,9 +363,9 @@ F:  tools/power/acpi/
 ACPI FAN DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
+S:     Supported
 W:     https://01.org/linux-acpi
 B:     https://bugzilla.kernel.org
-S:     Supported
 F:     drivers/acpi/fan.c
 
 ACPI FOR ARM64 (ACPI/arm64)
@@ -389,26 +389,26 @@ M:        Len Brown <lenb@kernel.org>
 R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 R:     Mika Westerberg <mika.westerberg@linux.intel.com>
 L:     linux-acpi@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-acpi/list/
+S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+Q:     https://patchwork.kernel.org/project/linux-acpi/list/
 B:     https://bugzilla.kernel.org
-S:     Supported
 F:     drivers/acpi/pmic/
 
 ACPI THERMAL DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
+S:     Supported
 W:     https://01.org/linux-acpi
 B:     https://bugzilla.kernel.org
-S:     Supported
 F:     drivers/acpi/*thermal*
 
 ACPI VIDEO DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
+S:     Supported
 W:     https://01.org/linux-acpi
 B:     https://bugzilla.kernel.org
-S:     Supported
 F:     drivers/acpi/acpi_video.c
 
 ACPI WMI DRIVER
@@ -2092,6 +2092,7 @@ F:        drivers/rtc/rtc-pl031.c
 F:     drivers/watchdog/coh901327_wdt.c
 F:     Documentation/devicetree/bindings/arm/ste-*
 F:     Documentation/devicetree/bindings/arm/ux500/
+F:     Documentation/devicetree/bindings/arm/ux500.yaml
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 
 ARM/NUVOTON NPCM ARCHITECTURE
@@ -2795,11 +2796,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>
@@ -3288,6 +3289,8 @@ S:        Maintained
 N:     bcm2711
 N:     bcm2835
 F:     drivers/staging/vc04_services
+F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
+F:     drivers/pci/controller/pcie-brcmstb.c
 
 BROADCOM BCM47XX MIPS ARCHITECTURE
 M:     Hauke Mehrtens <hauke@hauke-m.de>
@@ -3343,6 +3346,8 @@ F:        drivers/bus/brcmstb_gisb.c
 F:     arch/arm/mm/cache-b15-rac.c
 F:     arch/arm/include/asm/hardware/cache-b15-rac.h
 N:     brcmstb
+F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
+F:     drivers/pci/controller/pcie-brcmstb.c
 
 BROADCOM BMIPS CPUFREQ DRIVER
 M:     Markus Mayer <mmayer@broadcom.com>
@@ -3417,8 +3422,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>
@@ -3476,8 +3481,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>
@@ -3592,8 +3597,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
@@ -3904,7 +3909,7 @@ S:        Supported
 F:     Documentation/filesystems/ceph.txt
 F:     fs/ceph/
 
-CERTIFICATE HANDLING:
+CERTIFICATE HANDLING
 M:     David Howells <dhowells@redhat.com>
 M:     David Woodhouse <dwmw2@infradead.org>
 L:     keyrings@vger.kernel.org
@@ -3914,7 +3919,7 @@ F:        certs/
 F:     scripts/sign-file.c
 F:     scripts/extract-cert.c
 
-CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
+CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM
 L:     devel@driverdev.osuosl.org
 S:     Obsolete
 F:     drivers/staging/wusbcore/
@@ -4478,13 +4483,10 @@ F:      drivers/net/wireless/st/cw1200/
 
 CX18 VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
-L:     ivtv-devel@ivtvdriver.org (subscribers-only)
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     https://linuxtv.org
-W:     http://www.ivtvdriver.org/index.php/Cx18
 S:     Maintained
-F:     Documentation/media/v4l-drivers/cx18*
 F:     drivers/media/pci/cx18/
 F:     include/uapi/linux/ivtv*
 
@@ -5930,12 +5932,12 @@ 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
+S:     Odd Fixes
 F:     Documentation/filesystems/ecryptfs.txt
 F:     fs/ecryptfs/
 
@@ -6906,7 +6908,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
 S:     Maintained
 F:     fs/fuse/
 F:     include/uapi/linux/fuse.h
-F:     Documentation/filesystems/fuse.txt
+F:     Documentation/filesystems/fuse.rst
 
 FUTEX SUBSYSTEM
 M:     Thomas Gleixner <tglx@linutronix.de>
@@ -7045,7 +7047,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>
@@ -7141,18 +7143,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/
 
@@ -7381,6 +7383,7 @@ F:        drivers/hwtracing/
 HARDWARE SPINLOCK CORE
 M:     Ohad Ben-Cohen <ohad@wizery.com>
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
+R:     Baolin Wang <baolin.wang7@gmail.com>
 L:     linux-remoteproc@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git hwspinlock-next
@@ -7816,9 +7819,7 @@ M:        Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     Documentation/i2c/busses/i2c-parport.rst
-F:     Documentation/i2c/busses/i2c-parport-light.rst
 F:     drivers/i2c/busses/i2c-parport.c
-F:     drivers/i2c/busses/i2c-parport-light.c
 
 I2C SUBSYSTEM
 M:     Wolfram Sang <wsa@the-dreams.de>
@@ -8054,8 +8055,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>
@@ -8199,8 +8200,7 @@ F:        Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
 F:     drivers/auxdisplay/img-ascii-lcd.c
 
 IMGTEC IR DECODER DRIVER
-M:     James Hogan <jhogan@kernel.org>
-S:     Maintained
+S:     Orphan
 F:     drivers/media/rc/img-ir/
 
 IMON SOUNDGRAPH USB IR RECEIVER
@@ -8392,7 +8392,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
@@ -8911,8 +8911,10 @@ L:       isdn4linux@listserv.isdn4linux.de (subscribers-only)
 L:     netdev@vger.kernel.org
 W:     http://www.isdn4linux.de
 S:     Maintained
-F:     drivers/isdn/mISDN
-F:     drivers/isdn/hardware
+F:     drivers/isdn/mISDN/
+F:     drivers/isdn/hardware/
+F:     drivers/isdn/Kconfig
+F:     drivers/isdn/Makefile
 
 ISDN/CMTP OVER BLUETOOTH
 M:     Karsten Keil <isdn@linux-pingi.de>
@@ -8945,10 +8947,9 @@ F:       drivers/media/tuners/it913x*
 
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
-L:     ivtv-devel@ivtvdriver.org (subscribers-only)
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
-W:     http://www.ivtvdriver.org
+W:     https://linuxtv.org
 S:     Maintained
 F:     Documentation/media/v4l-drivers/ivtv*
 F:     drivers/media/pci/ivtv/
@@ -9277,7 +9278,7 @@ F:        include/keys/trusted-type.h
 F:     security/keys/trusted.c
 F:     include/keys/trusted.h
 
-KEYS/KEYRINGS:
+KEYS/KEYRINGS
 M:     David Howells <dhowells@redhat.com>
 M:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 L:     keyrings@vger.kernel.org
@@ -11115,7 +11116,6 @@ F:      drivers/usb/image/microtek.*
 MIPS
 M:     Ralf Baechle <ralf@linux-mips.org>
 M:     Paul Burton <paulburton@kernel.org>
-M:     James Hogan <jhogan@kernel.org>
 L:     linux-mips@vger.kernel.org
 W:     http://www.linux-mips.org/
 T:     git git://git.linux-mips.org/pub/scm/ralf/linux.git
@@ -11484,7 +11484,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/
@@ -12919,7 +12919,7 @@ F:      arch/x86/kernel/early-quirks.c
 
 PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
 M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-R:     Andrew Murray <andrew.murray@arm.com>
+R:     Andrew Murray <amurray@thegoodpenguin.co.uk>
 L:     linux-pci@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-pci/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
@@ -13340,11 +13340,6 @@ T:     git git://github.com/intel/pm-graph
 S:     Supported
 F:     tools/power/pm-graph
 
-PNP SUPPORT
-M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
-S:     Maintained
-F:     drivers/pnp/
-
 PNI RM3100 IIO DRIVER
 M:     Song Qiang <songqiang1304521@gmail.com>
 L:     linux-iio@vger.kernel.org
@@ -13352,6 +13347,11 @@ S:     Maintained
 F:     drivers/iio/magnetometer/rm3100*
 F:     Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
 
+PNP SUPPORT
+M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+S:     Maintained
+F:     drivers/pnp/
+
 POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
@@ -13360,7 +13360,7 @@ S:      Maintained
 F:     fs/timerfd.c
 F:     include/linux/timer*
 F:     include/linux/time_namespace.h
-F:     kernel/time_namespace.c
+F:     kernel/time/namespace.c
 F:     kernel/time/*timer*
 
 POWER MANAGEMENT CORE
@@ -13512,7 +13512,7 @@ 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
@@ -14109,7 +14109,6 @@ F:      include/linux/platform_data/rtc-*
 F:     tools/testing/selftests/rtc/
 
 REALTEK AUDIO CODECS
-M:     Bard Liao <bardliao@realtek.com>
 M:     Oder Chiou <oder_chiou@realtek.com>
 S:     Maintained
 F:     sound/soc/codecs/rt*
@@ -14297,6 +14296,12 @@ F:     drivers/hid/hid-roccat*
 F:     include/linux/hid-roccat*
 F:     Documentation/ABI/*/sysfs-driver-hid-roccat*
 
+ROCKCHIP ISP V1 DRIVER
+M:     Helen Koike <helen.koike@collabora.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/media/rkisp1/
+
 ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
 M:     Jacob Chen <jacob-chen@iotwrt.com>
 M:     Ezequiel Garcia <ezequiel@collabora.com>
@@ -14577,10 +14582,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>
@@ -14944,8 +14949,8 @@ S:      Maintained
 F:     drivers/mmc/host/sdhci-omap.c
 
 SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
-M:     Scott Bauer <scott.bauer@intel.com>
 M:     Jonathan Derrick <jonathan.derrick@intel.com>
+M:     Revanth Rajashekar <revanth.rajashekar@intel.com>
 L:     linux-block@vger.kernel.org
 S:     Supported
 F:     block/sed*
@@ -15931,6 +15936,15 @@ S:     Supported
 F:     Documentation/networking/device_drivers/stmicro/
 F:     drivers/net/ethernet/stmicro/stmmac/
 
+EXTRA BOOT CONFIG
+M:     Masami Hiramatsu <mhiramat@kernel.org>
+S:     Maintained
+F:     lib/bootconfig.c
+F:     fs/proc/bootconfig.c
+F:     include/linux/bootconfig.h
+F:     tools/bootconfig/*
+F:     Documentation/admin-guide/bootconfig.rst
+
 SUN3/3X
 M:     Sam Creasey <sammy@sammy.net>
 W:     http://sammy.net/sun3/
@@ -16061,8 +16075,8 @@ 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>
@@ -16073,8 +16087,8 @@ 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>
@@ -16138,6 +16152,7 @@ F:      drivers/firmware/arm_scpi.c
 F:     drivers/firmware/arm_scmi/
 F:     drivers/reset/reset-scmi.c
 F:     include/linux/sc[mp]i_protocol.h
+F:     include/trace/events/scmi.h
 
 SYSTEM RESET/SHUTDOWN DRIVERS
 M:     Sebastian Reichel <sre@kernel.org>
@@ -16537,8 +16552,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
@@ -16737,6 +16752,7 @@ Q:      http://patchwork.linuxtv.org/project/linux-media/list/
 S:     Maintained
 F:     drivers/media/platform/ti-vpe/
 F:     Documentation/devicetree/bindings/media/ti,vpe.yaml
+       Documentation/devicetree/bindings/media/ti,cal.yaml
 
 TI WILINK WIRELESS DRIVERS
 L:     linux-wireless@vger.kernel.org
@@ -17064,7 +17080,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
@@ -17078,18 +17094,18 @@ S:    Maintained
 F:     drivers/usb/common/ulpi.c
 F:     include/linux/ulpi/
 
-ULTRA-WIDEBAND (UWB) SUBSYSTEM:
+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
@@ -17122,7 +17138,6 @@ F:      drivers/staging/unisys/
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 R:     Alim Akhtar <alim.akhtar@samsung.com>
 R:     Avri Altman <avri.altman@wdc.com>
-R:     Pedro Sousa <pedrom.sousa@synopsys.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     Documentation/scsi/ufs.txt
@@ -17377,11 +17392,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>
@@ -17392,14 +17410,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>
@@ -17776,6 +17791,12 @@ F:     include/linux/vbox_utils.h
 F:     include/uapi/linux/vbox*.h
 F:     drivers/virt/vboxguest/
 
+VIRTUAL BOX SHARED FOLDER VFS DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-fsdevel@vger.kernel.org
+S:     Maintained
+F:     fs/vboxsf/*
+
 VIRTUAL SERIO DEVICE DRIVER
 M:     Stephen Chandler Paul <thatslyude@gmail.com>
 S:     Maintained
@@ -18104,8 +18125,8 @@ F:      Documentation/core-api/workqueue.rst
 X-POWERS AXP288 PMIC DRIVERS
 M:     Hans de Goede <hdegoede@redhat.com>
 S:     Maintained
-N:     axp288
 F:     drivers/acpi/pmic/intel_pmic_xpower.c
+N:     axp288
 
 X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
 M:     Chen-Yu Tsai <wens@csie.org>
@@ -18393,8 +18414,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>
@@ -18475,6 +18496,16 @@ L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     arch/x86/kernel/cpu/zhaoxin.c
 
+ZONEFS FILESYSTEM
+M:     Damien Le Moal <damien.lemoal@wdc.com>
+M:     Naohiro Aota <naohiro.aota@wdc.com>
+R:     Johannes Thumshirn <jth@kernel.org>
+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
+
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>
 L:     linux-mm@kvack.org
local clone of linux.git