Merge tag 'timers-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3a4163be98dad11524d51c99a417c09556669598..f74871a22c426a559e5dae06494e1f7d78d97ca6 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
@@ -674,6 +674,14 @@ S: Maintained
 F:     Documentation/i2c/busses/i2c-ali1563.rst
 F:     drivers/i2c/busses/i2c-ali1563.c
 
+ALL SENSORS DLH SERIES PRESSURE SENSORS DRIVER
+M:     Tomislav Denis <tomislav.denis@avl.com>
+W:     http://www.allsensors.com/
+S:     Maintained
+L:     linux-iio@vger.kernel.org
+F:     drivers/iio/pressure/dlhl60d.c
+F:     Documentation/devicetree/bindings/iio/pressure/asc,dlhl60d.yaml
+
 ALLEGRO DVT VIDEO IP CORE DRIVER
 M:     Michael Tretter <m.tretter@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
@@ -694,6 +702,14 @@ L: linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/allwinner/
 
+ALLWINNER THERMAL DRIVER
+M:     Vasily Khoruzhick <anarsoul@gmail.com>
+M:     Yangtao Li <tiny.windzz@gmail.com>
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
+F:     drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:     Maxime Ripard <mripard@kernel.org>
 M:     Paul Kocialkowski <paul.kocialkowski@bootlin.com>
@@ -726,7 +742,7 @@ S:  Maintained
 F:     drivers/mailbox/mailbox-altera.c
 
 ALTERA PIO DRIVER
-M:     Tien Hock Loh <thloh@altera.com>
+M:     Joyce Ooi <joyce.ooi@intel.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-altera.c
@@ -791,7 +807,6 @@ F:  include/uapi/rdma/efa-abi.h
 
 AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
-M:     Gary Hook <gary.hook@amd.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/ccp/
@@ -900,6 +915,14 @@ S: Supported
 F:     drivers/iio/dac/ad5758.c
 F:     Documentation/devicetree/bindings/iio/dac/ad5758.txt
 
+ANALOG DEVICES INC AD7091R5 DRIVER
+M:     Beniamin Bia <beniamin.bia@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7091r5.c
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
+
 ANALOG DEVICES INC AD7124 DRIVER
 M:     Stefan Popa <stefan.popa@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1054,7 +1077,7 @@ S:        Supported
 F:     Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
 F:     Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
 F:     drivers/iio/*/ad*
-F:     drivers/iio/adc/ltc2497*
+F:     drivers/iio/adc/ltc249*
 X:     drivers/iio/*/adjd*
 F:     drivers/staging/iio/*/ad*
 
@@ -2069,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
@@ -3109,6 +3133,13 @@ S:       Supported
 F:     drivers/net/bonding/
 F:     include/uapi/linux/if_bonding.h
 
+BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
+M:     Dan Robertson <dan@dlrobertson.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/accel/bma400*
+F:     Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
+
 BPF (Safe dynamic programs and tools)
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
@@ -3258,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>
@@ -3313,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>
@@ -4448,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*
 
@@ -4866,6 +4898,7 @@ S:        Supported
 F:     net/core/devlink.c
 F:     include/net/devlink.h
 F:     include/uapi/linux/devlink.h
+F:     Documentation/networking/devlink
 
 DIALOG SEMICONDUCTOR DRIVERS
 M:     Support Opensource <support.opensource@diasemi.com>
@@ -4994,6 +5027,24 @@ F:       Documentation/driver-api/dma-buf.rst
 K:     dma_(buf|fence|resv)
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
+DMA-BUF HEAPS FRAMEWORK
+M:     Sumit Semwal <sumit.semwal@linaro.org>
+R:     Andrew F. Davis <afd@ti.com>
+R:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
+R:     Liam Mark <lmark@codeaurora.org>
+R:     Laura Abbott <labbott@redhat.com>
+R:     Brian Starkey <Brian.Starkey@arm.com>
+R:     John Stultz <john.stultz@linaro.org>
+S:     Maintained
+L:     linux-media@vger.kernel.org
+L:     dri-devel@lists.freedesktop.org
+L:     linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
+F:     include/uapi/linux/dma-heap.h
+F:     include/linux/dma-heap.h
+F:     drivers/dma-buf/dma-heap.c
+F:     drivers/dma-buf/heaps/*
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:     Vinod Koul <vkoul@kernel.org>
 L:     dmaengine@vger.kernel.org
@@ -5199,6 +5250,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/bochs/
 
+DRM DRIVER FOR BOE HIMAX8279D PANELS
+M:     Jerry Han <hanxu5@huaqin.corp-partner.google.com>
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-boe-himax8279d.c
+F:     Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
+
 DRM DRIVER FOR FARADAY TVE200 TV ENCODER
 M:     Linus Walleij <linus.walleij@linaro.org>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5354,6 +5411,12 @@ S:       Maintained
 F:     drivers/gpu/drm/tiny/st7735r.c
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.txt
 
+DRM DRIVER FOR SONY ACX424AKP 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-sony-acx424akp.c
+
 DRM DRIVER FOR ST-ERICSSON MCDE
 M:     Linus Walleij <linus.walleij@linaro.org>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5426,7 +5489,6 @@ 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:     Sean Paul <sean@poorly.run>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -6173,6 +6235,12 @@ M:       Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
 F:     drivers/media/rc/ene_ir.*
 
+EPAPR HYPERVISOR BYTE CHANNEL DEVICE DRIVER
+M:     Laurentiu Tudor <laurentiu.tudor@nxp.com>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Maintained
+F:     drivers/tty/ehv_bytechan.c
+
 EPSON S1D13XXX FRAMEBUFFER DRIVER
 M:     Kristoffer Ericson <kristoffer.ericson@gmail.com>
 S:     Maintained
@@ -6421,6 +6489,7 @@ F:        fs/*
 F:     include/linux/fs.h
 F:     include/linux/fs_types.h
 F:     include/uapi/linux/fs.h
+F:     include/uapi/linux/openat2.h
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:     Riku Voipio <riku.voipio@iki.fi>
@@ -6839,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>
@@ -7314,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
@@ -7593,9 +7663,8 @@ S:        Orphan
 F:     drivers/net/usb/hso.c
 
 HSR NETWORK PROTOCOL
-M:     Arvid Brodin <arvid.brodin@alten.se>
 L:     netdev@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     net/hsr/
 
 HT16K33 LED CONTROLLER DRIVER
@@ -7750,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>
@@ -8133,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
@@ -8375,7 +8441,6 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:     drivers/gpio/gpio-ich.c
 F:     drivers/gpio/gpio-intel-mid.c
-F:     drivers/gpio/gpio-lynxpoint.c
 F:     drivers/gpio/gpio-merrifield.c
 F:     drivers/gpio/gpio-ml-ioh.c
 F:     drivers/gpio/gpio-pch.c
@@ -8846,10 +8911,12 @@ 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/CAPI SUBSYSTEM
+ISDN/CMTP OVER BLUETOOTH
 M:     Karsten Keil <isdn@linux-pingi.de>
 L:     isdn4linux@listserv.isdn4linux.de (subscribers-only)
 L:     netdev@vger.kernel.org
@@ -8857,7 +8924,6 @@ W:        http://www.isdn4linux.de
 S:     Odd Fixes
 F:     Documentation/isdn/
 F:     drivers/isdn/capi/
-F:     drivers/staging/isdn/
 F:     net/bluetooth/cmtp/
 F:     include/linux/isdn/
 F:     include/uapi/linux/isdn/
@@ -8881,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/
@@ -9171,7 +9236,7 @@ F:        arch/x86/include/uapi/asm/svm.h
 F:     arch/x86/include/asm/kvm*
 F:     arch/x86/include/asm/pvclock-abi.h
 F:     arch/x86/include/asm/svm.h
-F:     arch/x86/include/asm/vmx.h
+F:     arch/x86/include/asm/vmx*.h
 F:     arch/x86/kernel/kvm.c
 F:     arch/x86/kernel/kvmclock.c
 
@@ -9620,6 +9685,7 @@ LINUX KERNEL DUMP TEST MODULE (LKDTM)
 M:     Kees Cook <keescook@chromium.org>
 S:     Maintained
 F:     drivers/misc/lkdtm/*
+F:     tools/testing/selftests/lkdtm/*
 
 LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 M:     Alan Stern <stern@rowland.harvard.edu>
@@ -9928,7 +9994,7 @@ S:        Maintained
 F:     drivers/net/dsa/mv88e6xxx/
 F:     include/linux/platform_data/mv88e6xxx.h
 F:     Documentation/devicetree/bindings/net/dsa/marvell.txt
-F:     Documentation/networking/devlink-params-mv88e6xxx.txt
+F:     Documentation/networking/devlink/mv88e6xxx.rst
 
 MARVELL ARMADA DRM SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
@@ -9998,8 +10064,7 @@ F:       drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
 M:     Amitkumar Karwar <amitkarwar@gmail.com>
-M:     Nishant Sarmukadam <nishants@marvell.com>
-M:     Ganapathi Bhat <gbhat@marvell.com>
+M:     Ganapathi Bhat <ganapathi.bhat@nxp.com>
 M:     Xinming Hu <huxinming820@gmail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
@@ -10038,6 +10103,16 @@ M:     Jerin Jacob <jerinj@marvell.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/marvell/octeontx2/af/
+F:     Documentation/networking/device_drivers/marvell/octeontx2.rst
+
+MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
+M:     Sunil Goutham <sgoutham@marvell.com>
+M:     Geetha sowjanya <gakula@marvell.com>
+M:     Subbaraya Sundeep <sbhatta@marvell.com>
+M:     hariprasad <hkelam@marvell.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/marvell/octeontx2/nic/
 
 MATROX FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
@@ -10320,7 +10395,7 @@ L:      linux-media@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Supported
-F:     Documentation/devicetree/bindings/media/renesas,ceu.txt
+F:     Documentation/devicetree/bindings/media/renesas,ceu.yaml
 F:     drivers/media/platform/renesas-ceu.c
 F:     include/media/drv-intf/renesas-ceu.h
 
@@ -10358,7 +10433,7 @@ L:      linux-media@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Supported
-F:     Documentation/devicetree/bindings/media/renesas,csi2.txt
+F:     Documentation/devicetree/bindings/media/renesas,csi2.yaml
 F:     Documentation/devicetree/bindings/media/renesas,vin.txt
 F:     drivers/media/platform/rcar-vin/
 
@@ -11041,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
@@ -11432,7 +11506,7 @@ F:      Documentation/networking/net_failover.rst
 
 NETEM NETWORK EMULATOR
 M:     Stephen Hemminger <stephen@networkplumber.org>
-L:     netem@lists.linux-foundation.org (moderated for non-subscribers)
+L:     netdev@vger.kernel.org
 S:     Maintained
 F:     net/sched/sch_netem.c
 
@@ -11620,6 +11694,18 @@ F:     net/ipv6/calipso.c
 F:     net/netfilter/xt_CONNSECMARK.c
 F:     net/netfilter/xt_SECMARK.c
 
+NETWORKING [MPTCP]
+M:     Mat Martineau <mathew.j.martineau@linux.intel.com>
+M:     Matthieu Baerts <matthieu.baerts@tessares.net>
+L:     netdev@vger.kernel.org
+L:     mptcp@lists.01.org
+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:     net/mptcp/
+F:     tools/testing/selftests/net/mptcp/
+
 NETWORKING [TCP]
 M:     Eric Dumazet <edumazet@google.com>
 L:     netdev@vger.kernel.org
@@ -12478,7 +12564,7 @@ L:      linux-crypto@vger.kernel.org
 S:     Maintained
 F:     kernel/padata.c
 F:     include/linux/padata.h
-F:     Documentation/padata.txt
+F:     Documentation/core-api/padata.rst
 
 PAGE POOL
 M:     Jesper Dangaard Brouer <hawk@kernel.org>
@@ -12494,6 +12580,13 @@ L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/panasonic-laptop.c
 
+PARALLAX PING IIO SENSOR DRIVER
+M:     Andreas Klinger <ak@it-klinger.de>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iio/proximity/parallax-ping.yaml
+F:     drivers/iio/proximity/ping.c
+
 PARALLEL LCD/KEYPAD PANEL DRIVER
 M:     Willy Tarreau <willy@haproxy.com>
 M:     Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
@@ -12631,7 +12724,7 @@ M:      Rob Herring <robh@kernel.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/versatile.txt
+F:     Documentation/devicetree/bindings/pci/versatile.yaml
 F:     drivers/pci/controller/pci-versatile.c
 
 PCI DRIVER FOR ARMADA 8K
@@ -12664,7 +12757,7 @@ M:      Will Deacon <will@kernel.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/host-generic-pci.txt
+F:     Documentation/devicetree/bindings/pci/host-generic-pci.yaml
 F:     drivers/pci/controller/pci-host-common.c
 F:     drivers/pci/controller/pci-host-generic.c
 
@@ -12826,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/
@@ -13247,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
@@ -13259,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
@@ -13703,6 +13796,13 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 S:     Supported
 F:     drivers/net/wireless/ath/ath10k/
 
+QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
+M:     Kalle Valo <kvalo@codeaurora.org>
+L:     ath11k@lists.infradead.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
+S:     Supported
+F:     drivers/net/wireless/ath/ath11k/
+
 QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 M:     QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
 L:     linux-wireless@vger.kernel.org
@@ -14009,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*
@@ -14197,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>
@@ -14568,7 +14673,7 @@ F:      drivers/media/i2c/s5k5baf.c
 SAMSUNG S5P Security SubSystem (SSS) DRIVER
 M:     Krzysztof Kozlowski <krzk@kernel.org>
 M:     Vladimir Zapolskiy <vz@mleia.com>
-M:     Kamil Konieczny <k.konieczny@partner.samsung.com>
+M:     Kamil Konieczny <k.konieczny@samsung.com>
 L:     linux-crypto@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
@@ -14844,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*
@@ -15107,11 +15212,8 @@ F:     drivers/video/fbdev/sm712*
 F:     Documentation/fb/sm712fb.rst
 
 SIMPLE FIRMWARE INTERFACE (SFI)
-M:     Len Brown <lenb@kernel.org>
-L:     sfi-devel@simplefirmware.org
 W:     http://simplefirmware.org/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
-S:     Supported
+S:     Obsolete
 F:     arch/x86/platform/sfi/
 F:     drivers/sfi/
 F:     include/linux/sfi*.h
@@ -15831,8 +15933,18 @@ M:     Jose Abreu <joabreu@synopsys.com>
 L:     netdev@vger.kernel.org
 W:     http://www.stlinux.com
 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/
@@ -16040,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>
@@ -16403,12 +16516,15 @@ F:    Documentation/devicetree/bindings/thermal/
 
 THERMAL/CPU_COOLING
 M:     Amit Daniel Kachhap <amit.kachhap@gmail.com>
+M:     Daniel Lezcano <daniel.lezcano@linaro.org>
 M:     Viresh Kumar <viresh.kumar@linaro.org>
 M:     Javi Merino <javi.merino@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/driver-api/thermal/cpu-cooling-api.rst
-F:     drivers/thermal/cpu_cooling.c
+F:     Documentation/driver-api/thermal/cpu-idle-cooling.rst
+F:     drivers/thermal/cpufreq_cooling.c
+F:     drivers/thermal/cpuidle_cooling.c
 F:     include/linux/cpu_cooling.h
 
 THERMAL DRIVER FOR AMLOGIC SOCS
@@ -16435,6 +16551,7 @@ M:      Andreas Noever <andreas.noever@gmail.com>
 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
 F:     Documentation/admin-guide/thunderbolt.rst
@@ -16635,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
@@ -17020,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
@@ -17437,7 +17554,7 @@ F:      drivers/mtd/nand/raw/vf610_nfc.c
 VFAT/FAT/MSDOS FILESYSTEM
 M:     OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
 S:     Maintained
-F:     Documentation/filesystems/vfat.txt
+F:     Documentation/filesystems/vfat.rst
 F:     fs/fat/
 
 VFIO DRIVER
@@ -17560,6 +17677,7 @@ F:      net/vmw_vsock/diag.c
 F:     net/vmw_vsock/af_vsock_tap.c
 F:     net/vmw_vsock/virtio_transport_common.c
 F:     net/vmw_vsock/virtio_transport.c
+F:     net/vmw_vsock/vsock_loopback.c
 F:     drivers/net/vsockmon.c
 F:     drivers/vhost/vsock.c
 F:     tools/testing/vsock/
@@ -17930,6 +18048,14 @@ L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-ws16c48.c
 
+WIREGUARD SECURE NETWORK TUNNEL
+M:     Jason A. Donenfeld <Jason@zx2c4.com>
+S:     Maintained
+F:     drivers/net/wireguard/
+F:     tools/testing/selftests/wireguard/
+L:     wireguard@lists.zx2c4.com
+L:     netdev@vger.kernel.org
+
 WISTRON LAPTOP BUTTON DRIVER
 M:     Miloslav Trmac <mitr@volny.cz>
 S:     Maintained
@@ -17993,8 +18119,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>