Merge tag 'arm-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f474153dbec578618dd3d8f75b2702f810879ad..00e85fa45afcba5267bc361672ab47b1af040035 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -929,6 +929,12 @@ L: [email protected]
 S:     Maintained
 F:     drivers/i2c/busses/i2c-amd-mp2*
 
+AMD PMC DRIVER
+M:     Shyam Sundar S K <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/platform/x86/amd-pmc.*
+
 AMD POWERPLAY
 M:     Evan Quan <[email protected]>
 L:     [email protected]
@@ -950,6 +956,14 @@ S: Supported
 F:     arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
 F:     drivers/net/ethernet/amd/xgbe/
 
+AMD SENSOR FUSION HUB DRIVER
+M:     Nehal Shah <[email protected]>
+M:     Sandeep Singh <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/hid/amd-sfh*
+F:     drivers/hid/amd-sfh-hid/
+
 AMS AS73211 DRIVER
 M:     Christian Eggers <[email protected]>
 L:     [email protected]
@@ -1073,6 +1087,7 @@ M:        Hans Verkuil <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/media/i2c/adv7604*
+F:     Documentation/devicetree/bindings/media/i2c/adv7604.yaml
 
 ANALOG DEVICES INC ADV7842 DRIVER
 M:     Hans Verkuil <[email protected]>
@@ -1173,16 +1188,6 @@ S:       Supported
 F:     Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
 F:     drivers/rtc/rtc-goldfish.c
 
-ANDROID ION DRIVER
-M:     Laura Abbott <[email protected]>
-M:     Sumit Semwal <[email protected]>
-L:     [email protected]
-L:     [email protected]
-L:     [email protected] (moderated for non-subscribers)
-S:     Supported
-F:     drivers/staging/android/ion
-F:     drivers/staging/android/uapi/ion.h
-
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:     Johannes Berg <[email protected]>
 L:     [email protected]
@@ -1486,10 +1491,20 @@ F:      Documentation/devicetree/bindings/iommu/arm,smmu*
 F:     drivers/iommu/arm/
 F:     drivers/iommu/io-pgtable-arm*
 
+ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
+M:     Arnd Bergmann <[email protected]>
+M:     Olof Johansson <[email protected]>
+M:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
+F:     arch/arm/boot/dts/Makefile
+F:     arch/arm64/boot/dts/Makefile
+
 ARM SUB-ARCHITECTURES
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
 F:     arch/arm/mach-*/
 F:     arch/arm/plat-*/
 
@@ -1501,7 +1516,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/arm/actions.yaml
 F:     Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 F:     Documentation/devicetree/bindings/dma/owl-dma.yaml
-F:     Documentation/devicetree/bindings/i2c/i2c-owl.txt
+F:     Documentation/devicetree/bindings/i2c/i2c-owl.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
 F:     Documentation/devicetree/bindings/mmc/owl-mmc.yaml
 F:     Documentation/devicetree/bindings/pinctrl/actions,*
@@ -1792,14 +1807,6 @@ F:       drivers/firmware/turris-mox-rwtm.c
 F:     drivers/gpio/gpio-moxtet.c
 F:     include/linux/moxtet.h
 
-ARM/EBSA110 MACHINE SUPPORT
-M:     Russell King <[email protected]>
-L:     [email protected] (moderated for non-subscribers)
-S:     Maintained
-W:     http://www.armlinux.org.uk/
-F:     arch/arm/mach-ebsa110/
-F:     drivers/net/ethernet/amd/am79c961a.*
-
 ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 M:     Uwe Kleine-König <[email protected]>
 R:     Pengutronix Kernel Team <[email protected]>
@@ -2019,7 +2026,7 @@ M:        Sebastian Hesselbarth <[email protected]>
 M:     Gregory Clement <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
-T:     git git://git.infradead.org/linux-mvebu.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
 F:     Documentation/devicetree/bindings/soc/dove/
 F:     arch/arm/boot/dts/dove*
 F:     arch/arm/boot/dts/orion5x*
@@ -2035,7 +2042,7 @@ M:        Gregory Clement <[email protected]>
 M:     Sebastian Hesselbarth <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
-T:     git git://git.infradead.org/linux-mvebu.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
 F:     arch/arm/boot/dts/armada*
 F:     arch/arm/boot/dts/kirkwood*
 F:     arch/arm/configs/mvebu_*_defconfig
@@ -2117,8 +2124,16 @@ L:       [email protected] (moderated for non-subscribers)
 S:     Supported
 T:     git git://github.com/microchip-ung/linux-upstream.git
 F:     arch/arm64/boot/dts/microchip/
+F:     drivers/pinctrl/pinctrl-microchip-sgpio.c
 N:     sparx5
 
+Microchip Timer Counter Block (TCB) Capture Driver
+M:     Kamel Bouhara <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+L:     [email protected]
+S:     Maintained
+F:     drivers/counter/microchip-tcb-capture.c
+
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -2474,7 +2489,7 @@ F:        drivers/clk/socfpga/
 ARM/SOCFPGA EDAC SUPPORT
 M:     Dinh Nguyen <[email protected]>
 S:     Maintained
-F:     drivers/edac/altera_edac.
+F:     drivers/edac/altera_edac.[ch]
 
 ARM/SPREADTRUM SoC SUPPORT
 M:     Orson Zhai <[email protected]>
@@ -2952,7 +2967,7 @@ ATMEL MAXTOUCH DRIVER
 M:     Nick Dyer <[email protected]>
 S:     Maintained
 T:     git git://github.com/ndyer/linux.git
-F:     Documentation/devicetree/bindings/input/atmel,maxtouch.txt
+F:     Documentation/devicetree/bindings/input/atmel,maxtouch.yaml
 F:     drivers/input/touchscreen/atmel_mxt_ts.c
 
 ATMEL WIRELESS DRIVER
@@ -2971,6 +2986,8 @@ L:        [email protected]
 S:     Maintained
 F:     arch/*/include/asm/atomic*.h
 F:     include/*/atomic*.h
+F:     include/linux/refcount.h
+F:     Documentation/atomic_*.txt
 F:     scripts/atomic/
 
 ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
@@ -3109,8 +3126,6 @@ Q:        https://patchwork.open-mesh.org/project/batman/list/
 B:     https://www.open-mesh.org/projects/batman-adv/issues
 C:     irc://chat.freenode.net/batman
 T:     git https://git.open-mesh.org/linux-merge.git
-F:     Documentation/ABI/obsolete/sysfs-class-net-batman-adv
-F:     Documentation/ABI/obsolete/sysfs-class-net-mesh
 F:     Documentation/networking/batman-adv.rst
 F:     include/uapi/linux/batadv_packet.h
 F:     include/uapi/linux/batman_adv.h
@@ -3194,8 +3209,9 @@ F:        drivers/mtd/devices/block2mtd.c
 BLUETOOTH DRIVERS
 M:     Marcel Holtmann <[email protected]>
 M:     Johan Hedberg <[email protected]>
+M:     Luiz Augusto von Dentz <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Supported
 W:     http://www.bluez.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
@@ -3204,8 +3220,9 @@ F:        drivers/bluetooth/
 BLUETOOTH SUBSYSTEM
 M:     Marcel Holtmann <[email protected]>
 M:     Johan Hedberg <[email protected]>
+M:     Luiz Augusto von Dentz <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Supported
 W:     http://www.bluez.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
@@ -3237,7 +3254,7 @@ R:        Martin KaFai Lau <[email protected]>
 R:     Song Liu <[email protected]>
 R:     Yonghong Song <[email protected]>
 R:     John Fastabend <[email protected]>
-R:     KP Singh <kpsingh@chromium.org>
+R:     KP Singh <kpsingh@kernel.org>
 L:     [email protected]
 L:     [email protected]
 S:     Supported
@@ -3356,7 +3373,7 @@ F:        arch/x86/net/
 X:     arch/x86/net/bpf_jit_comp32.c
 
 BPF LSM (Security Audit and Enforcement using BPF)
-M:     KP Singh <kpsingh@chromium.org>
+M:     KP Singh <kpsingh@kernel.org>
 R:     Florent Revest <[email protected]>
 R:     Brendan Jackman <[email protected]>
 L:     [email protected]
@@ -3570,6 +3587,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
 F:     drivers/usb/host/ehci-brcm.*
 
+BROADCOM BRCMSTB USB PIN MAP DRIVER
+M:     Al Cooper <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
+F:     drivers/usb/misc/brcmstb-usb-pinmap.c
+
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
 M:     Al Cooper <[email protected]>
 L:     [email protected]
@@ -3855,6 +3880,7 @@ CADENCE USB3 DRD IP DRIVER
 M:     Peter Chen <[email protected]>
 M:     Pawel Laszczak <[email protected]>
 M:     Roger Quadros <[email protected]>
+R:     Aswath Govindraju <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
@@ -3870,9 +3896,8 @@ T:        git git://linuxtv.org/media_tree.git
 F:     drivers/media/radio/radio-cadet*
 
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
-M:     Jonathan Corbet <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Orphan
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/cafe_ccic*
 F:     drivers/media/platform/marvell-ccic/
@@ -4353,7 +4378,7 @@ CODA V4L2 MEM2MEM DRIVER
 M:     Philipp Zabel <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/coda.txt
+F:     Documentation/devicetree/bindings/media/coda.yaml
 F:     drivers/media/platform/coda/
 
 CODE OF CONDUCT
@@ -4495,6 +4520,13 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/hwmon/corsair-cpro.c
 
+CORSAIR-PSU HARDWARE MONITOR DRIVER
+M:     Wilken Gottwalt <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/hwmon/corsair-psu.rst
+F:     drivers/hwmon/corsair-psu.c
+
 COSA/SRP SYNC SERIAL DRIVER
 M:     Jan "Yenya" Kasprzak <[email protected]>
 S:     Maintained
@@ -4990,6 +5022,15 @@ M:       Mario Limonciello <[email protected]>
 S:     Maintained
 F:     drivers/platform/x86/dell-wmi-descriptor.c
 
+DELL WMI SYSMAN DRIVER
+M:     Divya Bharathi <[email protected]>
+M:     Mario Limonciello <[email protected]>
+M:     Prasanth Ksr <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-class-firmware-attributes
+F:     drivers/platform/x86/dell-wmi-sysman/
+
 DELL WMI NOTIFICATIONS DRIVER
 M:     Matthew Garrett <[email protected]>
 M:     Pali Rohár <[email protected]>
@@ -5119,7 +5160,9 @@ M:        Support Opensource <[email protected]>
 S:     Supported
 W:     http://www.dialog-semiconductor.com/products
 F:     Documentation/devicetree/bindings/input/da90??-onkey.txt
+F:     Documentation/devicetree/bindings/input/dlg,da72??.txt
 F:     Documentation/devicetree/bindings/mfd/da90*.txt
+F:     Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
 F:     Documentation/devicetree/bindings/regulator/da92*.txt
 F:     Documentation/devicetree/bindings/regulator/slg51000.txt
 F:     Documentation/devicetree/bindings/sound/da[79]*.txt
@@ -5129,6 +5172,7 @@ F:        Documentation/hwmon/da90??.rst
 F:     drivers/gpio/gpio-da90??.c
 F:     drivers/hwmon/da90??-hwmon.c
 F:     drivers/iio/adc/da91??-*.c
+F:     drivers/input/misc/da72??.[ch]
 F:     drivers/input/misc/da90??_onkey.c
 F:     drivers/input/touchscreen/da9052_tsi.c
 F:     drivers/leds/leds-da90??.c
@@ -5144,6 +5188,7 @@ F:        drivers/rtc/rtc-da90??.c
 F:     drivers/thermal/da90??-thermal.c
 F:     drivers/video/backlight/da90??_bl.c
 F:     drivers/watchdog/da90??_wdt.c
+F:     include/dt-bindings/regulator/dlg,da9*-regulator.h
 F:     include/linux/mfd/da903x.h
 F:     include/linux/mfd/da9052/
 F:     include/linux/mfd/da9055/
@@ -5578,6 +5623,13 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
 F:     drivers/gpu/drm/panel/panel-novatek-nt35510.c
 
+DRM DRIVER FOR NOVATEK NT36672A PANELS
+M:     Sumit Semwal <[email protected]>
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
+F:     drivers/gpu/drm/panel/panel-novatek-nt36672a.c
+
 DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 M:     Ben Skeggs <[email protected]>
 L:     [email protected]
@@ -5865,6 +5917,7 @@ S:        Supported
 F:     Documentation/devicetree/bindings/display/mediatek/
 F:     drivers/gpu/drm/mediatek/
 F:     drivers/phy/mediatek/phy-mtk-hdmi*
+F:     drivers/phy/mediatek/phy-mtk-mipi*
 
 DRM DRIVERS FOR NVIDIA TEGRA
 M:     Thierry Reding <[email protected]>
@@ -5957,6 +6010,7 @@ F:        include/uapi/drm/v3d_drm.h
 
 DRM DRIVERS FOR VC4
 M:     Eric Anholt <[email protected]>
+M:     Maxime Ripard <[email protected]>
 S:     Supported
 T:     git git://github.com/anholt/linux
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -6351,6 +6405,13 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/edac/ie31200_edac.c
 
+EDAC-IGEN6
+M:     Tony Luck <[email protected]>
+R:     Qiuxu Zhuo <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/edac/igen6_edac.c
+
 EDAC-MPC85XX
 M:     Johannes Thumshirn <[email protected]>
 L:     [email protected]
@@ -6400,7 +6461,7 @@ EDAC-SKYLAKE
 M:     Tony Luck <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/edac/skx_*.c
+F:     drivers/edac/skx_*.[ch]
 
 EDAC-TI
 M:     Tero Kristo <[email protected]>
@@ -6907,17 +6968,10 @@ S:      Maintained
 W:     http://floatingpoint.sourceforge.net/emulator/index.html
 F:     arch/x86/math-emu/
 
-FRAME RELAY DLCI/FRAD (Sangoma drivers too)
-L:     [email protected]
-S:     Orphan
-F:     drivers/net/wan/dlci.c
-F:     drivers/net/wan/sdla.c
-
 FRAMEBUFFER LAYER
-M:     Bartlomiej Zolnierkiewicz <[email protected]>
 L:     [email protected]
 L:     [email protected]
-S:     Maintained
+S:     Orphan
 Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/fb/
@@ -7294,7 +7348,6 @@ F:        drivers/staging/gasket/
 
 GCC PLUGINS
 M:     Kees Cook <[email protected]>
-R:     Emese Revfy <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/kbuild/gcc-plugins.rst
@@ -7336,6 +7389,17 @@ S:       Maintained
 F:     drivers/base/arch_topology.c
 F:     include/linux/arch_topology.h
 
+GENERIC ENTRY CODE
+M:     Thomas Gleixner <[email protected]>
+M:     Peter Zijlstra <[email protected]>
+M:     Andy Lutomirski <[email protected]>
+L:     [email protected]
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/entry
+F:     include/linux/entry-common.h
+F:     include/linux/entry-kvm.h
+F:     kernel/entry/
+
 GENERIC GPIO I2C DRIVER
 M:     Wolfram Sang <[email protected]>
 S:     Supported
@@ -7700,9 +7764,9 @@ F:        drivers/clocksource/h8300_*.c
 F:     drivers/irqchip/irq-renesas-h8*.c
 
 HABANALABS PCI DRIVER
-M:     Oded Gabbay <o[email protected]>
+M:     Oded Gabbay <o[email protected]>
 S:     Supported
-T:     git https://github.com/HabanaAI/linux.git
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git
 F:     Documentation/ABI/testing/debugfs-driver-habanalabs
 F:     Documentation/ABI/testing/sysfs-driver-habanalabs
 F:     drivers/misc/habanalabs/
@@ -7900,6 +7964,15 @@ F:       include/linux/hippidevice.h
 F:     include/uapi/linux/if_hippi.h
 F:     net/802/hippi.c
 
+HIRSCHMANN HELLCREEK ETHERNET SWITCH DRIVER
+M:     Kurt Kanzenbach <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml
+F:     drivers/net/dsa/hirschmann/*
+F:     include/linux/platform_data/hirschmann-hellcreek.h
+F:     net/dsa/tag_hellcreek.c
+
 HISILICON DMA DRIVER
 M:     Zhou Wang <[email protected]>
 L:     [email protected]
@@ -7998,7 +8071,7 @@ F:        drivers/staging/hikey9xx/
 HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
 M:     Zaibo Xu <[email protected]>
 S:     Maintained
-F:     drivers/char/hw_random/hisi-trng-v2.c
+F:     drivers/crypto/hisilicon/trng/trng.c
 
 HISILICON V3XX SPI NOR FLASH Controller Driver
 M:     John Garry <[email protected]>
@@ -8626,7 +8699,7 @@ INA209 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/ina2xx.txt
+F:     Documentation/devicetree/bindings/hwmon/ti,ina2xx.yaml
 F:     Documentation/hwmon/ina209.rst
 F:     drivers/hwmon/ina209.c
 
@@ -8672,19 +8745,16 @@ F:      include/uapi/rdma/
 F:     samples/bpf/ibumad_kern.c
 F:     samples/bpf/ibumad_user.c
 
-INGENIC JZ4780 DMA Driver
-M:     Zubair Lutfullah Kakakhel <[email protected]>
-S:     Maintained
-F:     drivers/dma/dma-jz4780.c
-
 INGENIC JZ4780 NAND DRIVER
 M:     Harvey Hunt <[email protected]>
 L:     [email protected]
+L:     [email protected]
 S:     Maintained
 F:     drivers/mtd/nand/raw/ingenic/
 
 INGENIC JZ47xx SoCs
 M:     Paul Cercueil <[email protected]>
+L:     [email protected]
 S:     Maintained
 F:     arch/mips/boot/dts/ingenic/
 F:     arch/mips/generic/board-ingenic.c
@@ -8957,6 +9027,23 @@ M:       Deepak Saxena <[email protected]>
 S:     Maintained
 F:     drivers/char/hw_random/ixp4xx-rng.c
 
+INTEL KEEM BAY DRM DRIVER
+M:     Anitha Chrisanthus <[email protected]>
+M:     Edmund Dea <[email protected]>
+S:     Maintained
+F:     Documentation/devicetree/bindings/display/intel,kmb_display.yaml
+F:     drivers/gpu/drm/kmb/
+
+INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
+M:     Daniele Alessandrelli <[email protected]>
+S:     Maintained
+F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
+F:     drivers/crypto/keembay/Kconfig
+F:     drivers/crypto/keembay/Makefile
+F:     drivers/crypto/keembay/keembay-ocs-aes-core.c
+F:     drivers/crypto/keembay/ocs-aes.c
+F:     drivers/crypto/keembay/ocs-aes.h
+
 INTEL MANAGEMENT ENGINE (mei)
 M:     Tomas Winkler <[email protected]>
 L:     [email protected]
@@ -9004,6 +9091,12 @@ F:       drivers/mfd/intel_soc_pmic*
 F:     include/linux/mfd/intel_msic.h
 F:     include/linux/mfd/intel_soc_pmic*
 
+INTEL PMT DRIVER
+M:     "David E. Box" <[email protected]>
+S:     Maintained
+F:     drivers/mfd/intel_pmt.c
+F:     drivers/platform/x86/intel_pmt_*
+
 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:     Stanislav Yakovlev <[email protected]>
 L:     [email protected]
@@ -9086,16 +9179,6 @@ W:       https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 F:     drivers/net/wireless/intel/iwlwifi/
 
-INTEL WIRELESS WIMAX CONNECTION 2400
-M:     Inaky Perez-Gonzalez <[email protected]>
-M:     [email protected]
-L:     [email protected] (subscribers-only)
-S:     Supported
-W:     http://linuxwimax.org
-F:     Documentation/admin-guide/wimax/i2400m.rst
-F:     drivers/net/wimax/i2400m/
-F:     include/uapi/linux/wimax/i2400m.h
-
 INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
 M:     Jithu Joseph <[email protected]>
 R:     Maurice Ma <[email protected]>
@@ -9125,6 +9208,19 @@ F:       Documentation/x86/intel_txt.rst
 F:     arch/x86/kernel/tboot.c
 F:     include/linux/tboot.h
 
+INTEL SGX
+M:     Jarkko Sakkinen <[email protected]>
+L:     [email protected]
+S:     Supported
+Q:     https://patchwork.kernel.org/project/intel-sgx/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git
+F:     Documentation/x86/sgx.rst
+F:     arch/x86/entry/vdso/vsgx.S
+F:     arch/x86/include/uapi/asm/sgx.h
+F:     arch/x86/kernel/cpu/sgx/*
+F:     tools/testing/selftests/sgx/*
+K:     \bSGX_
+
 INTERCONNECT API
 M:     Georgi Djakov <[email protected]>
 L:     [email protected]
@@ -9140,7 +9236,7 @@ INVENSENSE ICM-426xx IMU DRIVER
 M:     Jean-Baptiste Maneyrol <[email protected]>
 L:     [email protected]
 S:     Maintained
-W      https://invensense.tdk.com/
+W:     https://invensense.tdk.com/
 F:     Documentation/devicetree/bindings/iio/imu/invensense,icm42600.yaml
 F:     drivers/iio/imu/inv_icm42600/
 
@@ -9620,7 +9716,7 @@ F:        arch/arm64/kvm/
 F:     include/kvm/arm_*
 
 KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
-M:     Huacai Chen <chenh[email protected]>
+M:     Huacai Chen <chenh[email protected]>
 M:     Aleksandar Markovic <[email protected]>
 L:     [email protected]
 L:     [email protected]
@@ -10371,6 +10467,8 @@ L:      [email protected]
 S:     Maintained
 W:     http://www.mac.linux-m68k.org/
 F:     arch/m68k/mac/
+F:     drivers/macintosh/adb-iop.c
+F:     drivers/macintosh/via-macii.c
 
 M68K ON HP9000/300
 M:     Philip Blundell <[email protected]>
@@ -10470,6 +10568,7 @@ M:      Srujana Challa <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/crypto/marvell/
+F:     include/linux/soc/marvell/octeontx2/
 
 MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
 M:     Mirko Lindner <[email protected]>
@@ -10513,6 +10612,14 @@ L:     [email protected]
 S:     Maintained
 F:     drivers/net/ethernet/marvell/mvneta.*
 
+MARVELL MVPP2 ETHERNET DRIVER
+M:     Marcin Wojtas <[email protected]>
+M:     Russell King <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/marvell-pp2.txt
+F:     drivers/net/ethernet/marvell/mvpp2/
+
 MARVELL MWIFIEX WIRELESS DRIVER
 M:     Amitkumar Karwar <[email protected]>
 M:     Ganapathi Bhat <[email protected]>
@@ -10542,6 +10649,7 @@ M:      hariprasad <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/net/ethernet/marvell/octeontx2/nic/
+F:     include/linux/soc/marvell/octeontx2/
 
 MARVELL OCTEONTX2 RVU ADMIN FUNCTION DRIVER
 M:     Sunil Goutham <[email protected]>
@@ -10553,6 +10661,13 @@ S:     Supported
 F:     Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
 F:     drivers/net/ethernet/marvell/octeontx2/af/
 
+MARVELL PRESTERA ETHERNET SWITCH DRIVER
+M:     Vadym Kochan <[email protected]>
+M:     Taras Chornyi <[email protected]>
+S:     Supported
+W:     https://github.com/Marvell-switching/switchdev-prestera
+F:     drivers/net/ethernet/marvell/prestera/
+
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:     Nicolas Pitre <[email protected]>
 S:     Odd Fixes
@@ -10822,8 +10937,8 @@ L:      [email protected]
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/imx7.rst
-F:     Documentation/devicetree/bindings/media/imx7-csi.txt
-F:     Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
+F:     Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
+F:     Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
 F:     drivers/staging/media/imx/imx7-media-csi.c
 F:     drivers/staging/media/imx/imx7-mipi-csis.c
 
@@ -11082,6 +11197,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
 F:     drivers/i2c/busses/i2c-mt7621.c
 
+MEDIATEK MT7621 PHY PCI DRIVER
+M:     Sergio Paracuellos <[email protected]>
+S:     Maintained
+F:     Documentation/devicetree/bindings/phy/mediatek,mt7621-pci-phy.yaml
+F:     drivers/phy/ralink/phy-mt7621-pci.c
+
 MEDIATEK NAND CONTROLLER DRIVER
 L:     [email protected]
 S:     Orphan
@@ -11160,6 +11281,7 @@ MELLANOX BLUEFIELD I2C DRIVER
 M:     Khalil Blaiech <[email protected]>
 L:     [email protected]
 S:     Supported
+F:     Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml
 F:     drivers/i2c/busses/i2c-mlxbf.c
 
 MELLANOX ETHERNET DRIVER (mlx4_en)
@@ -11313,7 +11435,6 @@ L:      [email protected]
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 S:     Maintained
-F:     drivers/devfreq/tegra20-devfreq.c
 F:     drivers/devfreq/tegra30-devfreq.c
 
 MEMORY MANAGEMENT
@@ -11386,6 +11507,15 @@ F:     Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
 F:     drivers/media/cec/platform/meson/ao-cec-g12a.c
 F:     drivers/media/cec/platform/meson/ao-cec.c
 
+MESON GE2D DRIVER FOR AMLOGIC SOCS
+M:     Neil Armstrong <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Supported
+T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
+F:     drivers/media/meson/ge2d/
+
 MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 M:     Liang Yang <[email protected]>
 L:     [email protected]
@@ -11502,7 +11632,7 @@ M:      Woojung Huh <[email protected]>
 M:     Microchip Linux Driver Support <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     Documentation/devicetree/bindings/net/dsa/ksz.txt
+F:     Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
 F:     drivers/net/dsa/microchip/*
 F:     include/linux/platform_data/microchip-ksz.h
 F:     net/dsa/tag_ksz.c
@@ -11624,17 +11754,54 @@ F:    drivers/scsi/smartpqi/smartpqi*.[ch]
 F:     include/linux/cciss*.h
 F:     include/uapi/linux/cciss*.h
 
+MICROSOFT SURFACE GPE LID SUPPORT DRIVER
+M:     Maximilian Luz <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/platform/surface/surface_gpe.c
+
+MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
+M:     Hans de Goede <[email protected]>
+M:     Mark Gross <[email protected]>
+M:     Maximilian Luz <[email protected]>
+L:     [email protected]
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
+F:     drivers/platform/surface/
+
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:     Chen Yu <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/platform/x86/surfacepro3_button.c
+F:     drivers/platform/surface/surfacepro3_button.c
 
 MICROTEK X6 SCANNER
 M:     Oliver Neukum <[email protected]>
 S:     Maintained
 F:     drivers/usb/image/microtek.*
 
+MIKROTIK CRS3XX 98DX3236 BOARD SUPPORT
+M:     Luka Kovacic <[email protected]>
+M:     Luka Perkov <[email protected]>
+S:     Maintained
+F:     arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
+F:     arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts
+F:     arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
+F:     arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts
+F:     arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
+F:     arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts
+
+MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
+M:     Sakari Ailus <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
+F:     Documentation/driver-api/media/drivers/ccs/
+F:     drivers/media/i2c/ccs-pll.c
+F:     drivers/media/i2c/ccs-pll.h
+F:     drivers/media/i2c/ccs/
+F:     include/uapi/linux/smiapp.h
+
 MIPS
 M:     Thomas Bogendoerfer <[email protected]>
 L:     [email protected]
@@ -11702,7 +11869,7 @@ F:      drivers/*/*/*loongson2*
 F:     drivers/*/*loongson2*
 
 MIPS/LOONGSON64 ARCHITECTURE
-M:     Huacai Chen <chenh[email protected]>
+M:     Huacai Chen <chenh[email protected]>
 M:     Jiaxun Yang <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -11905,7 +12072,7 @@ M:      Jacopo Mondi <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt
+F:     Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
 F:     drivers/media/i2c/mt9v111.c
 
 MULTIFUNCTION DEVICES (MFD)
@@ -12249,6 +12416,7 @@ L:      [email protected]
 S:     Maintained
 W:     https://github.com/multipath-tcp/mptcp_net-next/wiki
 B:     https://github.com/multipath-tcp/mptcp_net-next/issues
+F:     Documentation/networking/mptcp-sysctl.rst
 F:     include/net/mptcp.h
 F:     include/uapi/linux/mptcp.h
 F:     net/mptcp/
@@ -12539,7 +12707,7 @@ NXP FXAS21002C DRIVER
 M:     Rui Miguel Silva <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt
+F:     Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.yaml
 F:     drivers/iio/gyro/fxas21002c.h
 F:     drivers/iio/gyro/fxas21002c_core.c
 F:     drivers/iio/gyro/fxas21002c_i2c.c
@@ -12553,6 +12721,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
 F:     drivers/gpu/drm/imx/dcss/
 
+NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
+M:     Jagan Teki <[email protected]>
+S:     Maintained
+F:     Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
+F:     drivers/regulator/pf8x00-regulator.c
+
 NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 M:     Krzysztof Kozlowski <[email protected]>
 L:     [email protected]
@@ -12850,6 +13024,14 @@ M:     Harald Welte <[email protected]>
 S:     Maintained
 F:     drivers/char/pcmcia/cm4040_cs.*
 
+OMNIVISION OV02A10 SENSOR DRIVER
+M:     Dongchun Zhu <[email protected]>
+L:     [email protected]
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
+F:     drivers/media/i2c/ov02a10.c
+
 OMNIVISION OV13858 SENSOR DRIVER
 M:     Sakari Ailus <[email protected]>
 L:     [email protected]
@@ -12862,7 +13044,7 @@ M:      Rui Miguel Silva <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/ov2680.txt
+F:     Documentation/devicetree/bindings/media/i2c/ov2680.yaml
 F:     drivers/media/i2c/ov2680.c
 
 OMNIVISION OV2685 SENSOR DRIVER
@@ -12920,9 +13102,8 @@ T:      git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/ov5695.c
 
 OMNIVISION OV7670 SENSOR DRIVER
-M:     Jonathan Corbet <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Orphan
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/ov7670.txt
 F:     drivers/media/i2c/ov7670.c
@@ -12932,7 +13113,7 @@ M:      Jacopo Mondi <[email protected]>
 L:     [email protected]
 S:     Odd fixes
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/ov772x.txt
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml
 F:     drivers/media/i2c/ov772x.c
 F:     include/media/i2c/ov772x.h
 
@@ -12968,6 +13149,14 @@ T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/ov9650.txt
 F:     drivers/media/i2c/ov9650.c
 
+OMNIVISION OV9734 SENSOR DRIVER
+M:     Tianshu Qiu <[email protected]>
+R:     Bingbu Cao <[email protected]>
+L:     [email protected]
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/i2c/ov9734.c
+
 ONENAND FLASH DRIVER
 M:     Kyungmin Park <[email protected]>
 L:     [email protected]
@@ -13176,7 +13365,7 @@ F:      include/trace/events/page_pool.h
 F:     net/core/page_pool.c
 
 PANASONIC LAPTOP ACPI EXTRAS DRIVER
-M:     Harald Welte <[email protected]>
+M:     Kenneth Chan <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/platform/x86/panasonic-laptop.c
@@ -13475,6 +13664,8 @@ M:      Kishon Vijay Abraham I <[email protected]>
 M:     Lorenzo Pieralisi <[email protected]>
 L:     [email protected]
 S:     Supported
+F:     Documentation/PCI/endpoint/*
+F:     Documentation/misc-devices/pci-endpoint-test.rst
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
 F:     drivers/misc/pci_endpoint_test.c
 F:     drivers/pci/endpoint/
@@ -13898,6 +14089,13 @@ M:     Logan Gunthorpe <[email protected]>
 S:     Maintained
 F:     drivers/dma/plx_dma.c
 
+PM6764TR DRIVER
+M:     Charles Hsu     <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/hwmon/pm6764tr.rst
+F:     drivers/hwmon/pmbus/pm6764tr.c
+
 PM-GRAPH UTILITY
 M:     "Todd E Brandt" <[email protected]>
 L:     [email protected]
@@ -14440,6 +14638,7 @@ W:      https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
 F:     drivers/net/wireless/ath/ath9k/
 
 QUALCOMM CAMERA SUBSYSTEM DRIVER
+M:     Robert Foss <[email protected]>
 M:     Todor Tomov <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -14521,6 +14720,14 @@ F:     Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
 F:     drivers/mailbox/qcom-ipcc.c
 F:     include/dt-bindings/mailbox/qcom-ipcc.h
 
+QUALCOMM IPQ4019 USB PHY DRIVER
+M:     Robert Marko <[email protected]>
+M:     Luka Perkov <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/phy/qcom-usb-ipq4019-phy.yaml
+F:     drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c
+
 QUALCOMM IPQ4019 VQMMC REGULATOR DRIVER
 M:     Robert Marko <[email protected]>
 M:     Luka Perkov <[email protected]>
@@ -14929,6 +15136,7 @@ M:      Philipp Zabel <[email protected]>
 S:     Maintained
 T:     git git://git.pengutronix.de/git/pza/linux
 F:     Documentation/devicetree/bindings/reset/
+F:     Documentation/driver-api/reset.rst
 F:     drivers/reset/
 F:     include/dt-bindings/reset/
 F:     include/linux/reset-controller.h
@@ -15013,10 +15221,13 @@ ROCKCHIP ISP V1 DRIVER
 M:     Helen Koike <[email protected]>
 M:     Dafna Hirschfeld <[email protected]>
 L:     [email protected]
+L:     [email protected]
 S:     Maintained
 F:     Documentation/admin-guide/media/rkisp1.rst
+F:     Documentation/devicetree/bindings/media/rockchip-isp1.yaml
 F:     Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
-F:     drivers/staging/media/rkisp1/
+F:     drivers/media/platform/rockchip/rkisp1
+F:     include/uapi/linux/rkisp1-config.h
 
 ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
 M:     Jacob Chen <[email protected]>
@@ -15378,6 +15589,14 @@ L:     [email protected]
 S:     Maintained
 F:     drivers/video/fbdev/s3c-fb.c
 
+SAMSUNG INTERCONNECT DRIVERS
+M:     Sylwester Nawrocki <[email protected]>
+M:     Artur Świgoń <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Supported
+F:     drivers/interconnect/samsung/
+
 SAMSUNG LAPTOP DRIVER
 M:     Corentin Chary <[email protected]>
 L:     [email protected]
@@ -15581,6 +15800,15 @@ F:     Documentation/scsi/st.rst
 F:     drivers/scsi/st.*
 F:     drivers/scsi/st_*.h
 
+SCSI TARGET CORE USER DRIVER
+M:     Bodo Stroesser <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Supported
+F:     Documentation/target/tcmu-design.rst
+F:     drivers/target/target_core_user.c
+F:     include/uapi/linux/target_core_user.h
+
 SCSI TARGET SUBSYSTEM
 M:     "Martin K. Petersen" <[email protected]>
 L:     [email protected]
@@ -15804,13 +16032,14 @@ F:    include/linux/sfp.h
 K:     phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
 
 SGI GRU DRIVER
-M:     Dimitri Sivanich <sivanich@sgi.com>
+M:     Dimitri Sivanich <dimitri.sivanich@hpe.com>
 S:     Maintained
 F:     drivers/misc/sgi-gru/
 
 SGI XP/XPC/XPNET DRIVER
-M:     Cliff Whickman <[email protected]>
 M:     Robin Holt <[email protected]>
+M:     Steve Wahl <[email protected]>
+R:     Mike Travis <[email protected]>
 S:     Maintained
 F:     drivers/misc/sgi-xp/
 
@@ -16095,16 +16324,6 @@ S:     Maintained
 F:     drivers/firmware/smccc/
 F:     include/linux/arm-smccc.h
 
-SMIA AND SMIA++ IMAGE SENSOR DRIVER
-M:     Sakari Ailus <[email protected]>
-L:     [email protected]
-S:     Maintained
-F:     Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
-F:     drivers/media/i2c/smiapp-pll.c
-F:     drivers/media/i2c/smiapp-pll.h
-F:     drivers/media/i2c/smiapp/
-F:     include/uapi/linux/smiapp.h
-
 SMM665 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <[email protected]>
 L:     [email protected]
@@ -16200,7 +16419,7 @@ F:      drivers/infiniband/sw/siw/
 F:     include/uapi/rdma/siw-abi.h
 
 SOFT-ROCE DRIVER (rxe)
-M:     Zhu Yanjun <yanjunz@nvidia.com>
+M:     Zhu Yanjun <zyjzyj2000@gmail.com>
 L:     [email protected]
 S:     Supported
 F:     drivers/infiniband/sw/rxe/
@@ -16267,7 +16486,7 @@ M:      Ricardo Ribalda <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
+F:     Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
 F:     drivers/media/i2c/imx214.c
 
 SONY IMX219 SENSOR DRIVER
@@ -16503,8 +16722,10 @@ F:     Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
 F:     drivers/net/ethernet/toshiba/spider_net*
 
 SPMI SUBSYSTEM
-R:     Stephen Boyd <[email protected]>
-L:     [email protected]
+M:     Stephen Boyd <[email protected]>
+L:     [email protected]
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
 F:     Documentation/devicetree/bindings/spmi/
 F:     drivers/spmi/
 F:     include/dt-bindings/spmi/spmi.h
@@ -17364,6 +17585,12 @@ 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
 F:     drivers/platform/x86/thinkpad_acpi.c
 
+THUNDERBOLT DMA TRAFFIC TEST DRIVER
+M:     Isaac Hazan <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/thunderbolt/dma_test.c
+
 THUNDERBOLT DRIVER
 M:     Andreas Noever <[email protected]>
 M:     Michael Jamet <[email protected]>
@@ -18363,6 +18590,12 @@ F:     include/uapi/linux/uuid.h
 F:     lib/test_uuid.c
 F:     lib/uuid.c
 
+UV SYSFS DRIVER
+M:     Justin Ernst <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/platform/x86/uv_sysfs.c
+
 UVESAFB DRIVER
 M:     Michal Januszewski <[email protected]>
 L:     [email protected]
@@ -18885,18 +19118,6 @@ S:     Supported
 W:     https://wireless.wiki.kernel.org/en/users/Drivers/wil6210
 F:     drivers/net/wireless/ath/wil6210/
 
-WIMAX STACK
-M:     Inaky Perez-Gonzalez <[email protected]>
-M:     [email protected]
-L:     [email protected] (subscribers-only)
-S:     Supported
-W:     http://linuxwimax.org
-F:     Documentation/admin-guide/wimax/wimax.rst
-F:     include/linux/wimax/debug.h
-F:     include/net/wimax.h
-F:     include/uapi/linux/wimax.h
-F:     net/wimax/
-
 WINBOND CIR DRIVER
 M:     David Härdeman <[email protected]>
 S:     Maintained
@@ -19069,6 +19290,7 @@ F:      arch/x86/platform
 
 X86 PLATFORM UV HPE SUPERDOME FLEX
 M:     Steve Wahl <[email protected]>
+R:     Mike Travis <[email protected]>
 R:     Dimitri Sivanich <[email protected]>
 R:     Russ Anderson <[email protected]>
 S:     Supported
@@ -19411,6 +19633,13 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
 F:     Documentation/filesystems/zonefs.rst
 F:     fs/zonefs/
 
+ZPOOL COMPRESSED PAGE STORAGE API
+M:     Dan Streetman <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     include/linux/zpool.h
+F:     mm/zpool.c
+
 ZR36067 VIDEO FOR LINUX DRIVER
 M:     Corentin Labbe <[email protected]>
 L:     [email protected]
@@ -19421,13 +19650,6 @@ Q:     https://patchwork.linuxtv.org/project/linux-media/list/
 F:     Documentation/driver-api/media/drivers/zoran.rst
 F:     drivers/staging/media/zoran/
 
-ZPOOL COMPRESSED PAGE STORAGE API
-M:     Dan Streetman <[email protected]>
-L:     [email protected]
-S:     Maintained
-F:     include/linux/zpool.h
-F:     mm/zpool.c
-
 ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
 M:     Minchan Kim <[email protected]>
 M:     Nitin Gupta <[email protected]>