Merge branch 'i2c/for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[muen/linux.git] / MAINTAINERS
index 289dc9cc28c611ae7832ed6b3d12de11c25ea68c..2c7a9b3544ffb93eb455e92b7ea56b2dc23bc94b 100644 (file)
@@ -535,7 +535,7 @@ F:  Documentation/hwmon/adt7475
 F:     drivers/hwmon/adt7475.c
 
 ADVANSYS SCSI DRIVER
-M:     Matthew Wilcox <matthew@wil.cx>
+M:     Matthew Wilcox <willy@infradead.org>
 M:     Hannes Reinecke <hare@suse.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
@@ -549,6 +549,15 @@ W: http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/input/misc/adxl34x.c
 
+ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
+M:     Stefan Popa <stefan.popa@analog.com>
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/accel/adxl372.c
+F:     drivers/iio/accel/adxl372_spi.c
+F:     drivers/iio/accel/adxl372_i2c.c
+F:     Documentation/devicetree/bindings/iio/accel/adxl372.txt
+
 AF9013 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -839,7 +848,7 @@ ANALOG DEVICES INC ADGS1408 DRIVER
 M:     Mircea Caprioru <mircea.caprioru@analog.com>
 S:     Supported
 F:     drivers/mux/adgs1408.c
-F:     Documentation/devicetree/bindings/mux/adgs1408.txt
+F:     Documentation/devicetree/bindings/mux/adi,adgs1408.txt
 
 ANALOG DEVICES INC ADP5061 DRIVER
 M:     Stefan Popa <stefan.popa@analog.com>
@@ -932,6 +941,7 @@ M:  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:     Arve Hjønnevåg <arve@android.com>
 M:     Todd Kjos <tkjos@android.com>
 M:     Martijn Coenen <maco@android.com>
+M:     Joel Fernandes <joel@joelfernandes.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:     devel@driverdev.osuosl.org
 S:     Supported
@@ -1180,7 +1190,7 @@ N:        owl
 F:     arch/arm/mach-actions/
 F:     arch/arm/boot/dts/owl-*
 F:     arch/arm64/boot/dts/actions/
-F:     drivers/clocksource/owl-*
+F:     drivers/clocksource/timer-owl*
 F:     drivers/pinctrl/actions/*
 F:     drivers/soc/actions/
 F:     include/dt-bindings/power/owl-*
@@ -1603,7 +1613,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/boot/dts/lpc43*
 F:     drivers/clk/nxp/clk-lpc18xx*
-F:     drivers/clocksource/time-lpc32xx.c
+F:     drivers/clocksource/timer-lpc32xx.c
 F:     drivers/i2c/busses/i2c-lpc2k.c
 F:     drivers/memory/pl172.c
 F:     drivers/mtd/spi-nor/nxp-spifi.c
@@ -2195,6 +2205,7 @@ F:        drivers/clk/uniphier/
 F:     drivers/gpio/gpio-uniphier.c
 F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/irqchip/irq-uniphier-aidet.c
+F:     drivers/mmc/host/uniphier-sd.c
 F:     drivers/pinctrl/uniphier/
 F:     drivers/reset/reset-uniphier.c
 F:     drivers/tty/serial/8250/8250_uniphier.c
@@ -2219,7 +2230,7 @@ F:        arch/arm/mach-vexpress/
 F:     */*/vexpress*
 F:     */*/*/vexpress*
 F:     drivers/clk/versatile/clk-vexpress-osc.c
-F:     drivers/clocksource/versatile.c
+F:     drivers/clocksource/timer-versatile.c
 N:     mps2
 
 ARM/VFP SUPPORT
@@ -2241,7 +2252,7 @@ M:        Tony Prisk <linux@prisktech.co.nz>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-vt8500/
-F:     drivers/clocksource/vt8500_timer.c
+F:     drivers/clocksource/timer-vt8500.c
 F:     drivers/i2c/busses/i2c-wmt.c
 F:     drivers/mmc/host/wmt-sdmmc.c
 F:     drivers/pwm/pwm-vt8500.c
@@ -2306,7 +2317,7 @@ F:        drivers/cpuidle/cpuidle-zynq.c
 F:     drivers/block/xsysace.c
 N:     zynq
 N:     xilinx
-F:     drivers/clocksource/cadence_ttc_timer.c
+F:     drivers/clocksource/timer-cadence-ttc.c
 F:     drivers/i2c/busses/i2c-cadence.c
 F:     drivers/mmc/host/sdhci-of-arasan.c
 F:     drivers/edac/synopsys_edac.c
@@ -3006,6 +3017,14 @@ S:       Supported
 F:     drivers/gpio/gpio-brcmstb.c
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 
+BROADCOM BRCMSTB I2C DRIVER
+M:     Kamal Dasu <kdasu.kdev@gmail.com>
+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
+
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
 M:     Al Cooper <alcooperx@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -3113,6 +3132,15 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
 F:     drivers/memory/brcmstb_dpfe.c
 
+BROADCOM SPI DRIVER
+M:     Kamal Dasu <kdasu.kdev@gmail.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+S:     Maintained
+F:     Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
+F:     drivers/spi/spi-bcm-qspi.*
+F:     drivers/spi/spi-brcmstb-qspi.c
+F:     drivers/spi/spi-iproc-qspi.c
+
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org
@@ -3210,6 +3238,15 @@ T:       git git://git.alsa-project.org/alsa-kernel.git
 S:     Maintained
 F:     sound/pci/oxygen/
 
+C-SKY ARCHITECTURE
+M:     Guo Ren <ren_guo@c-sky.com>
+T:     git https://github.com/c-sky/csky-linux.git
+S:     Supported
+F:     arch/csky/
+F:     Documentation/devicetree/bindings/csky/
+K:     csky
+N:     csky
+
 C6X ARCHITECTURE
 M:     Mark Salter <msalter@redhat.com>
 M:     Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
@@ -3673,6 +3710,12 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/media/coda.txt
 F:     drivers/media/platform/coda/
 
+CODE OF CONDUCT
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:     Supported
+F:     Documentation/process/code-of-conduct.rst
+F:     Documentation/process/code-of-conduct-interpretation.rst
+
 COMMON CLK FRAMEWORK
 M:     Michael Turquette <mturquette@baylibre.com>
 M:     Stephen Boyd <sboyd@kernel.org>
@@ -4031,7 +4074,7 @@ M:        Uma Krishnan <ukrishn@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/cxlflash/
-F:     include/uapi/scsi/cxlflash_ioctls.h
+F:     include/uapi/scsi/cxlflash_ioctl.h
 F:     Documentation/powerpc/cxlflash.txt
 
 CYBERPRO FB DRIVER
@@ -4074,7 +4117,7 @@ D-LINK DIR-685 TOUCHKEYS DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-input@vger.kernel.org
 S:     Supported
-F:     drivers/input/dlink-dir685-touchkeys.c
+F:     drivers/input/keyboard/dlink-dir685-touchkeys.c
 
 DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
 M:     Joshua Kinard <kumba@gentoo.org>
@@ -4170,6 +4213,11 @@ 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
+F:     drivers/net/fddi/defza.*
+
 DELL LAPTOP DRIVER
 M:     Matthew Garrett <mjg59@srcf.ucam.org>
 M:     Pali Rohár <pali.rohar@gmail.com>
@@ -4349,13 +4397,6 @@ L:       linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-gpio-mm.c
 
-DIGI NEO AND CLASSIC PCI PRODUCTS
-M:     Lidza Louina <lidza.louina@gmail.com>
-M:     Mark Hounschell <markh@compro.net>
-L:     driverdev-devel@linuxdriverproject.org
-S:     Maintained
-F:     drivers/staging/dgnc/
-
 DIOLAN U2C-12 I2C DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-i2c@vger.kernel.org
@@ -4363,7 +4404,7 @@ S:        Maintained
 F:     drivers/i2c/busses/i2c-diolan-u2c.c
 
 FILESYSTEM DIRECT ACCESS (DAX)
-M:     Matthew Wilcox <mawilcox@microsoft.com>
+M:     Matthew Wilcox <willy@infradead.org>
 M:     Ross Zwisler <zwisler@kernel.org>
 M:     Jan Kara <jack@suse.cz>
 L:     linux-fsdevel@vger.kernel.org
@@ -4485,11 +4526,12 @@ S:      Maintained
 F:     Documentation/
 F:     scripts/kernel-doc
 X:     Documentation/ABI/
+X:     Documentation/acpi/
 X:     Documentation/devicetree/
-X:     Documentation/acpi
-X:     Documentation/power
-X:     Documentation/spi
-X:     Documentation/media
+X:     Documentation/i2c/
+X:     Documentation/media/
+X:     Documentation/power/
+X:     Documentation/spi/
 T:     git git://git.lwn.net/linux.git docs-next
 
 DOCUMENTATION/ITALIAN
@@ -4504,13 +4546,15 @@ L:      linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/i2c/dw9714.c
+F:     Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt
 
 DONGWOON DW9807 LENS VOICE COIL DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     drivers/media/i2c/dw9807.c
+F:     drivers/media/i2c/dw9807-vcm.c
+F:     Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.txt
 
 DOUBLETALK DRIVER
 M:     "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -4527,9 +4571,13 @@ F:       drivers/soc/fsl/dpio
 
 DPAA2 ETHERNET DRIVER
 M:     Ioana Radulescu <ruxandra.radulescu@nxp.com>
-L:     linux-kernel@vger.kernel.org
+L:     netdev@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/fsl-dpaa2/ethernet
+F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-eth*
+F:     drivers/net/ethernet/freescale/dpaa2/dpni*
+F:     drivers/net/ethernet/freescale/dpaa2/dpkg.h
+F:     drivers/net/ethernet/freescale/dpaa2/Makefile
+F:     drivers/net/ethernet/freescale/dpaa2/Kconfig
 
 DPAA2 ETHERNET SWITCH DRIVER
 M:     Ioana Radulescu <ruxandra.radulescu@nxp.com>
@@ -4540,9 +4588,10 @@ F:       drivers/staging/fsl-dpaa2/ethsw
 
 DPAA2 PTP CLOCK DRIVER
 M:     Yangbo Lu <yangbo.lu@nxp.com>
-L:     linux-kernel@vger.kernel.org
+L:     netdev@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/fsl-dpaa2/rtc
+F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*
+F:     drivers/net/ethernet/freescale/dpaa2/dprtc*
 
 DPT_I2O SCSI RAID DRIVER
 M:     Adaptec OEM Raid Solutions <aacraid@microsemi.com>
@@ -4720,8 +4769,11 @@ F:       drivers/gpu/drm/tdfx/
 
 DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 M:     Dave Airlie <airlied@redhat.com>
+R:     Sean Paul <sean@poorly.run>
+L:     dri-devel@lists.freedesktop.org
 S:     Odd Fixes
 F:     drivers/gpu/drm/udl/
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVER FOR VMWARE VIRTUAL GPU
 M:     "VMware Graphics" <linux-graphics-maintainer@vmware.com>
@@ -4751,8 +4803,8 @@ F:        include/uapi/drm/
 F:     include/linux/vga*
 
 DRM DRIVERS AND MISC GPU PATCHES
-M:     Gustavo Padovan <gustavo@padovan.org>
 M:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+M:     Maxime Ripard <maxime.ripard@bootlin.com>
 M:     Sean Paul <sean@poorly.run>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
@@ -4821,6 +4873,7 @@ 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
 M:     Philipp Zabel <p.zabel@pengutronix.de>
@@ -4870,9 +4923,10 @@ F:       Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 
 DRM DRIVERS FOR RENESAS
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+M:     Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
 L:     dri-devel@lists.freedesktop.org
 L:     linux-renesas-soc@vger.kernel.org
-T:     git git://linuxtv.org/pinchartl/fbdev
+T:     git git://linuxtv.org/pinchartl/media drm/du/next
 S:     Supported
 F:     drivers/gpu/drm/rcar-du/
 F:     drivers/gpu/drm/shmobile/
@@ -5329,7 +5383,8 @@ S:        Maintained
 F:     drivers/edac/r82600_edac.c
 
 EDAC-SBRIDGE
-M:     Mauro Carvalho Chehab <mchehab@kernel.org>
+M:     Tony Luck <tony.luck@intel.com>
+R:     Qiuxu Zhuo <qiuxu.zhuo@intel.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/sb_edac.c
@@ -5514,7 +5569,7 @@ W:        http://ext4.wiki.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-ext4/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
 S:     Maintained
-F:     Documentation/filesystems/ext4.txt
+F:     Documentation/filesystems/ext4/ext4.rst
 F:     fs/ext4/
 
 Extended Verification Module (EVM)
@@ -5624,10 +5679,9 @@ F:       Documentation/fault-injection/
 F:     lib/fault-inject.c
 
 FBTFT Framebuffer drivers
-M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+S:     Orphan
 L:     dri-devel@lists.freedesktop.org
 L:     linux-fbdev@vger.kernel.org
-S:     Maintained
 F:     drivers/staging/fbtft/
 
 FC0011 TUNER DRIVER
@@ -6454,6 +6508,7 @@ F:        Documentation/devicetree/bindings/hwmon/
 F:     Documentation/hwmon/
 F:     drivers/hwmon/
 F:     include/linux/hwmon*.h
+F:     include/trace/events/hwmon*.h
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
 M:     Matt Mackall <mpm@selenic.com>
@@ -6762,6 +6817,12 @@ S:       Maintained
 F:     mm/memory-failure.c
 F:     mm/hwpoison-inject.c
 
+HYGON PROCESSOR SUPPORT
+M:     Pu Wen <puwen@hygon.cn>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     arch/x86/kernel/cpu/hygon.c
+
 Hyper-V CORE AND DRIVERS
 M:     "K. Y. Srinivasan" <kys@microsoft.com>
 M:     Haiyang Zhang <haiyangz@microsoft.com>
@@ -7341,15 +7402,16 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
 S:     Supported
 F:     Documentation/networking/e100.rst
 F:     Documentation/networking/e1000.rst
-F:     Documentation/networking/e1000e.txt
-F:     Documentation/networking/igb.txt
-F:     Documentation/networking/igbvf.txt
-F:     Documentation/networking/ixgb.txt
-F:     Documentation/networking/ixgbe.txt
-F:     Documentation/networking/ixgbevf.txt
-F:     Documentation/networking/i40e.txt
-F:     Documentation/networking/i40evf.txt
-F:     Documentation/networking/ice.txt
+F:     Documentation/networking/e1000e.rst
+F:     Documentation/networking/fm10k.rst
+F:     Documentation/networking/igb.rst
+F:     Documentation/networking/igbvf.rst
+F:     Documentation/networking/ixgb.rst
+F:     Documentation/networking/ixgbe.rst
+F:     Documentation/networking/ixgbevf.rst
+F:     Documentation/networking/i40e.rst
+F:     Documentation/networking/iavf.rst
+F:     Documentation/networking/ice.rst
 F:     drivers/net/ethernet/intel/
 F:     drivers/net/ethernet/intel/*/
 F:     include/linux/avf/virtchnl.h
@@ -7371,6 +7433,12 @@ T:       git https://github.com/intel/gvt-linux.git
 S:     Supported
 F:     drivers/gpu/drm/i915/gvt/
 
+INTEL PMIC GPIO DRIVER
+R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+S:     Maintained
+F:     drivers/gpio/gpio-*cove.c
+F:     drivers/gpio/gpio-msic.c
+
 INTEL HID EVENT DRIVER
 M:     Alex Hung <alex.hung@canonical.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -7497,6 +7565,14 @@ 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
 
+INTEL MULTIFUNCTION PMIC DEVICE DRIVERS
+R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+S:     Maintained
+F:     drivers/mfd/intel_msic.c
+F:     drivers/mfd/intel_soc_pmic*
+F:     include/linux/mfd/intel_msic.h
+F:     include/linux/mfd/intel_soc_pmic*
+
 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:     Stanislav Yakovlev <stas.yakovlev@gmail.com>
 L:     linux-wireless@vger.kernel.org
@@ -7520,14 +7596,6 @@ S:       Supported
 F:     drivers/infiniband/hw/i40iw/
 F:     include/uapi/rdma/i40iw-abi.h
 
-INTEL SHA MULTIBUFFER DRIVER
-M:     Megha Dey <megha.dey@linux.intel.com>
-R:     Tim Chen <tim.c.chen@linux.intel.com>
-L:     linux-crypto@vger.kernel.org
-S:     Supported
-F:     arch/x86/crypto/sha*-mb/
-F:     crypto/mcryptd.c
-
 INTEL TELEMETRY DRIVER
 M:     Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -7635,6 +7703,7 @@ M:        Corey Minyard <minyard@acm.org>
 L:     openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://openipmi.sourceforge.net/
 S:     Supported
+F:     Documentation/devicetree/bindings/ipmi/
 F:     Documentation/IPMI.txt
 F:     drivers/char/ipmi/
 F:     include/linux/ipmi*
@@ -7671,7 +7740,6 @@ IPX NETWORK LAYER
 L:     netdev@vger.kernel.org
 S:     Obsolete
 F:     include/uapi/linux/ipx.h
-F:     drivers/staging/ipx/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 M:     Marc Zyngier <marc.zyngier@arm.com>
@@ -8106,6 +8174,7 @@ F:        security/keys/encrypted-keys/
 
 KEYS-TRUSTED
 M:     James Bottomley <jejb@linux.vnet.ibm.com>
+M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
@@ -8183,6 +8252,25 @@ S:       Maintained
 F:     net/l3mdev
 F:     include/net/l3mdev.h
 
+L7 BPF FRAMEWORK
+M:     John Fastabend <john.fastabend@gmail.com>
+M:     Daniel Borkmann <daniel@iogearbox.net>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     include/linux/skmsg.h
+F:     net/core/skmsg.c
+F:     net/core/sock_map.c
+F:     net/ipv4/tcp_bpf.c
+
+LANTIQ / INTEL Ethernet drivers
+M:     Hauke Mehrtens <hauke@hauke-m.de>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     net/dsa/tag_gswip.c
+F:     drivers/net/ethernet/lantiq_xrx200.c
+F:     drivers/net/dsa/lantiq_pce.h
+F:     drivers/net/dsa/lantiq_gswip.c
+
 LANTIQ MIPS ARCHITECTURE
 M:     John Crispin <john@phrozen.org>
 L:     linux-mips@linux-mips.org
@@ -8625,11 +8713,18 @@ F:      drivers/message/fusion/
 F:     drivers/scsi/mpt3sas/
 
 LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
-M:     Matthew Wilcox <matthew@wil.cx>
+M:     Matthew Wilcox <willy@infradead.org>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/sym53c8xx_2/
 
+LTC1660 DAC DRIVER
+M:     Marcus Folkesson <marcus.folkesson@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iio/dac/ltc1660.txt
+F:     drivers/iio/dac/ltc1660.c
+
 LTC4261 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -8743,7 +8838,7 @@ M:        Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/dsa/mv88e6xxx/
-F:     linux/platform_data/mv88e6xxx.h
+F:     include/linux/platform_data/mv88e6xxx.h
 F:     Documentation/devicetree/bindings/net/dsa/marvell.txt
 
 MARVELL ARMADA DRM SUPPORT
@@ -8833,6 +8928,15 @@ S:       Supported
 F:     drivers/mmc/host/sdhci-xenon*
 F:     Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
 
+MARVELL OCTEONTX2 RVU ADMIN FUNCTION DRIVER
+M:     Sunil Goutham <sgoutham@marvell.com>
+M:     Linu Cherian <lcherian@marvell.com>
+M:     Geetha sowjanya <gakula@marvell.com>
+M:     Jerin Jacob <jerinj@marvell.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/marvell/octeontx2/af/
+
 MATROX FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
@@ -8846,13 +8950,6 @@ S:       Maintained
 F:     Documentation/hwmon/max16065
 F:     drivers/hwmon/max16065.c
 
-MAX20751 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/max20751
-F:     drivers/hwmon/max20751.c
-
 MAX2175 SDR TUNER DRIVER
 M:     Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 L:     linux-media@vger.kernel.org
@@ -8991,11 +9088,10 @@ F:      drivers/media/dvb-frontends/cxd2880/*
 F:     drivers/media/spi/cxd2880*
 
 MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
-M:     Daniel Scheller <d.scheller.oss@gmail.com>
 L:     linux-media@vger.kernel.org
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-S:     Maintained
+S:     Orphan
 F:     drivers/media/pci/ddbridge/*
 
 MEDIA DRIVERS FOR FREESCALE IMX
@@ -9010,6 +9106,13 @@ F:       drivers/staging/media/imx/
 F:     include/linux/imx-media.h
 F:     include/media/imx.h
 
+MEDIA DRIVER FOR FREESCALE IMX PXP
+M:     Philipp Zabel <p.zabel@pengutronix.de>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/platform/imx-pxp.[ch]
+
 MEDIA DRIVERS FOR HELENE
 M:     Abylay Ospan <aospan@netup.ru>
 L:     linux-media@vger.kernel.org
@@ -9040,11 +9143,10 @@ S:      Supported
 F:     drivers/media/dvb-frontends/lnbh25*
 
 MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
-M:     Daniel Scheller <d.scheller.oss@gmail.com>
 L:     linux-media@vger.kernel.org
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-S:     Maintained
+S:     Orphan
 F:     drivers/media/dvb-frontends/mxl5xx*
 
 MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
@@ -9087,7 +9189,7 @@ F:        drivers/media/platform/rcar-fcp.c
 F:     include/media/rcar-fcp.h
 
 MEDIA DRIVERS FOR RENESAS - FDP1
-M:     Kieran Bingham <kieran@bingham.xyz>
+M:     Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -9107,6 +9209,7 @@ F:        drivers/media/platform/rcar-vin/
 
 MEDIA DRIVERS FOR RENESAS - VSP1
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+M:     Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -9115,19 +9218,17 @@ F:      Documentation/devicetree/bindings/media/renesas,vsp1.txt
 F:     drivers/media/platform/vsp1/
 
 MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
-M:     Daniel Scheller <d.scheller.oss@gmail.com>
 L:     linux-media@vger.kernel.org
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-S:     Maintained
+S:     Orphan
 F:     drivers/media/dvb-frontends/stv0910*
 
 MEDIA DRIVERS FOR ST STV6111 TUNER ICs
-M:     Daniel Scheller <d.scheller.oss@gmail.com>
 L:     linux-media@vger.kernel.org
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-S:     Maintained
+S:     Orphan
 F:     drivers/media/dvb-frontends/stv6111*
 
 MEDIA DRIVERS FOR STM32 - DCMI
@@ -9494,7 +9595,7 @@ MEN Z069 WATCHDOG DRIVER
 M:     Johannes Thumshirn <jth@kernel.org>
 L:     linux-watchdog@vger.kernel.org
 S:     Maintained
-F:     drivers/watchdog/menz069_wdt.c
+F:     drivers/watchdog/menz69_wdt.c
 
 MESON AO CEC DRIVER FOR AMLOGIC SOCS
 M:     Neil Armstrong <narmstrong@baylibre.com>
@@ -9518,6 +9619,7 @@ M:        Richard Genoud <richard.genoud@gmail.com>
 S:     Maintained
 F:     drivers/tty/serial/atmel_serial.c
 F:     drivers/tty/serial/atmel_serial.h
+F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
 
 MICROCHIP / ATMEL DMA DRIVER
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
@@ -9549,6 +9651,21 @@ S:       Supported
 F:     drivers/mtd/nand/raw/atmel/*
 F:     Documentation/devicetree/bindings/mtd/atmel-nand.txt
 
+MICROCHIP AT91 USART MFD DRIVER
+M:     Radu Pirea <radu_nicolae.pirea@upb.ro>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     drivers/mfd/at91-usart.c
+F:     include/dt-bindings/mfd/at91-usart.h
+F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+
+MICROCHIP AT91 USART SPI DRIVER
+M:     Radu Pirea <radu_nicolae.pirea@upb.ro>
+L:     linux-spi@vger.kernel.org
+S:     Supported
+F:     drivers/spi/spi-at91-usart.c
+F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 M:     Woojung Huh <Woojung.Huh@microchip.com>
 M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
@@ -9566,6 +9683,14 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/microchip/lan743x_*
 
+MICROCHIP / ATMEL MCP3911 ADC DRIVER
+M:     Marcus Folkesson <marcus.folkesson@gmail.com>
+M:     Kent Gustavsson <kent@minoris.se>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+F:     drivers/iio/adc/mcp3911.c
+F:     Documentation/devicetree/bindings/iio/adc/mcp3911.txt
+
 MICROCHIP USB251XB DRIVER
 M:     Richard Leitner <richard.leitner@skidata.com>
 L:     linux-usb@vger.kernel.org
@@ -9657,7 +9782,8 @@ MIPS/LOONGSON2 ARCHITECTURE
 M:     Jiaxun Yang <jiaxun.yang@flygoat.com>
 L:     linux-mips@linux-mips.org
 S:     Maintained
-F:     arch/mips/loongson64/*{2e/2f}*
+F:     arch/mips/loongson64/fuloong-2e/
+F:     arch/mips/loongson64/lemote-2f/
 F:     arch/mips/include/asm/mach-loongson64/
 F:     drivers/*/*loongson2*
 F:     drivers/*/*/*loongson2*
@@ -9697,6 +9823,19 @@ S:       Maintained
 F:     arch/arm/boot/dts/mmp*
 F:     arch/arm/mach-mmp/
 
+MMU GATHER AND TLB INVALIDATION
+M:     Will Deacon <will.deacon@arm.com>
+M:     "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
+M:     Andrew Morton <akpm@linux-foundation.org>
+M:     Nick Piggin <npiggin@gmail.com>
+M:     Peter Zijlstra <peterz@infradead.org>
+L:     linux-arch@vger.kernel.org
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     arch/*/include/asm/tlb.h
+F:     include/asm-generic/tlb.h
+F:     mm/mmu_gather.c
+
 MN88472 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -9864,7 +10003,7 @@ M:       Peter Rosin <peda@axentia.se>
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-class-mux*
 F:     Documentation/devicetree/bindings/mux/
-F:     include/linux/dt-bindings/mux/
+F:     include/dt-bindings/mux/
 F:     include/linux/mux/
 F:     drivers/mux/
 
@@ -9897,9 +10036,19 @@ F:      drivers/media/tuners/mxl5007t.*
 
 MXSFB DRM DRIVER
 M:     Marek Vasut <marex@denx.de>
+M:     Stefan Agner <stefan@agner.ch>
+L:     dri-devel@lists.freedesktop.org
 S:     Supported
 F:     drivers/gpu/drm/mxsfb/
 F:     Documentation/devicetree/bindings/display/mxsfb.txt
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+
+MYLEX DAC960 PCI RAID Controller
+M:     Hannes Reinecke <hare@kernel.org>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/myrb.*
+F:     drivers/scsi/myrs.*
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 M:     Chris Lee <christopher.lee@cspi.com>
@@ -9932,11 +10081,6 @@ NATSEMI ETHERNET DRIVER (DP8381x)
 S:     Orphan
 F:     drivers/net/ethernet/natsemi/natsemi.c
 
-NCP FILESYSTEM
-M:     Petr Vandrovec <petr@vandrovec.name>
-S:     Obsolete
-F:     drivers/staging/ncpfs/
-
 NCR 5380 SCSI DRIVERS
 M:     Finn Thain <fthain@telegraphics.com.au>
 M:     Michael Schmitz <schmitzmic@gmail.com>
@@ -10121,7 +10265,6 @@ L:      netdev@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
 S:     Maintained
-F:     net/core/flow.c
 F:     net/xfrm/
 F:     net/key/
 F:     net/ipv4/xfrm*
@@ -10184,6 +10327,8 @@ NETWORKING [TLS]
 M:     Boris Pismenny <borisp@mellanox.com>
 M:     Aviad Yehezkel <aviadye@mellanox.com>
 M:     Dave Watson <davejwatson@fb.com>
+M:     John Fastabend <john.fastabend@gmail.com>
+M:     Daniel Borkmann <daniel@iogearbox.net>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     net/tls/*
@@ -11188,7 +11333,7 @@ M:      Murali Karicheri <m-karicheri2@ti.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     drivers/pci/controller/dwc/*keystone*
+F:     drivers/pci/controller/dwc/pci-keystone.c
 
 PCI ENDPOINT SUBSYSTEM
 M:     Kishon Vijay Abraham I <kishon@ti.com>
@@ -11488,15 +11633,12 @@ S:    Maintained
 F:     drivers/pinctrl/intel/
 
 PIN CONTROLLER - MEDIATEK
-M:     Sean Wang <sean.wang@mediatek.com>
+M:     Sean Wang <sean.wang@kernel.org>
 L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
 F:     Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
-F:     drivers/pinctrl/mediatek/mtk-eint.*
-F:     drivers/pinctrl/mediatek/pinctrl-mtk-common.*
-F:     drivers/pinctrl/mediatek/pinctrl-mt2701.c
-F:     drivers/pinctrl/mediatek/pinctrl-mt7622.c
+F:     drivers/pinctrl/mediatek/
 
 PIN CONTROLLER - QUALCOMM
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
@@ -11574,7 +11716,26 @@ W:     http://hwmon.wiki.kernel.org/
 W:     http://www.roeck-us.net/linux/drivers/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
+F:     Documentation/devicetree/bindings/hwmon/max31785.txt
+F:     Documentation/devicetree/bindings/hwmon/ltc2978.txt
+F:     Documentation/hwmon/adm1275
+F:     Documentation/hwmon/ibm-cffps
+F:     Documentation/hwmon/ir35221
+F:     Documentation/hwmon/lm25066
+F:     Documentation/hwmon/ltc2978
+F:     Documentation/hwmon/ltc3815
+F:     Documentation/hwmon/max16064
+F:     Documentation/hwmon/max20751
+F:     Documentation/hwmon/max31785
+F:     Documentation/hwmon/max34440
+F:     Documentation/hwmon/max8688
 F:     Documentation/hwmon/pmbus
+F:     Documentation/hwmon/pmbus-core
+F:     Documentation/hwmon/tps40422
+F:     Documentation/hwmon/ucd9000
+F:     Documentation/hwmon/ucd9200
+F:     Documentation/hwmon/zl6100
 F:     drivers/hwmon/pmbus/
 F:     include/linux/pmbus.h
 
@@ -12679,6 +12840,18 @@ W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/s390/crypto/
 
+S390 VFIO AP DRIVER
+M:     Tony Krowiak <akrowiak@linux.ibm.com>
+M:     Pierre Morel <pmorel@linux.ibm.com>
+M:     Halil Pasic <pasic@linux.ibm.com>
+L:     linux-s390@vger.kernel.org
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+F:     drivers/s390/crypto/vfio_ap_drv.c
+F:     drivers/s390/crypto/vfio_ap_private.h
+F:     drivers/s390/crypto/vfio_ap_ops.c
+F:     Documentation/s390/vfio-ap.txt
+
 S390 ZFCP DRIVER
 M:     Steffen Maier <maier@linux.ibm.com>
 M:     Benjamin Block <bblock@linux.ibm.com>
@@ -13067,7 +13240,7 @@ SELINUX SECURITY MODULE
 M:     Paul Moore <paul@paul-moore.com>
 M:     Stephen Smalley <sds@tycho.nsa.gov>
 M:     Eric Paris <eparis@parisplace.org>
-L:     selinux@tycho.nsa.gov (moderated for non-subscribers)
+L:     selinux@vger.kernel.org
 W:     https://selinuxproject.org
 W:     https://github.com/SELinuxProject
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
@@ -13311,6 +13484,7 @@ M:      Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 S:     Supported
 F:     drivers/siox/*
+F:     drivers/gpio/gpio-siox.c
 F:     include/trace/events/siox.h
 
 SIS 190 ETHERNET DRIVER
@@ -13494,8 +13668,8 @@ L:      linux-arm-kernel@lists.infradead.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/firmware/sdei.txt
 F:     drivers/firmware/arm_sdei.c
-F:     include/linux/sdei.h
-F:     include/uapi/linux/sdei.h
+F:     include/linux/arm_sdei.h
+F:     include/uapi/linux/arm_sdei.h
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
 M:     Shaohua Li <shli@kernel.org>
@@ -13557,6 +13731,20 @@ S:     Maintained
 F:     drivers/media/i2c/imx274.c
 F:     Documentation/devicetree/bindings/media/i2c/imx274.txt
 
+SONY IMX319 SENSOR DRIVER
+M:     Bingbu Cao <bingbu.cao@intel.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/imx319.c
+
+SONY IMX355 SENSOR DRIVER
+M:     Tianshu Qiu <tian.shu.qiu@intel.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/imx355.c
+
 SONY MEMORYSTICK CARD SUPPORT
 M:     Alex Dubov <oakad@yahoo.com>
 W:     http://tifmxx.berlios.de/
@@ -13623,7 +13811,7 @@ F:      sound/soc/
 F:     include/sound/soc*
 
 SOUNDWIRE SUBSYSTEM
-M:     Vinod Koul <vinod.koul@intel.com>
+M:     Vinod Koul <vkoul@kernel.org>
 M:     Sanyog Kale <sanyog.r.kale@intel.com>
 R:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -13759,6 +13947,13 @@ L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-stm32*
 
+ST VL53L0X ToF RANGER(I2C) IIO DRIVER
+M:     Song Qiang <songqiang1304521@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/proximity/vl53l0x-i2c.c
+F:     Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt
+
 STABLE BRANCH
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     stable@vger.kernel.org
@@ -13778,11 +13973,6 @@ L:     linux-erofs@lists.ozlabs.org
 S:     Maintained
 F:     drivers/staging/erofs/
 
-STAGING - FLARION FT1000 DRIVERS
-M:     Marek Belisko <marek.belisko@gmail.com>
-S:     Odd Fixes
-F:     drivers/staging/ft1000/
-
 STAGING - INDUSTRIAL IO
 M:     Jonathan Cameron <jic23@kernel.org>
 L:     linux-iio@vger.kernel.org
@@ -13874,7 +14064,7 @@ F:      sound/soc/sti/
 STI CEC DRIVER
 M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
 S:     Maintained
-F:     drivers/staging/media/st-cec/
+F:     drivers/media/platform/sti/cec/
 F:     Documentation/devicetree/bindings/media/stih-cec.txt
 
 STK1160 USB VIDEO CAPTURE DRIVER
@@ -14038,6 +14228,12 @@ S:     Supported
 F:     drivers/reset/reset-axs10x.c
 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
+
 SYNOPSYS DESIGNWARE 8250 UART DRIVER
 R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 S:     Maintained
@@ -14624,6 +14820,13 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/ti/netcp*
 
+TI PCM3060 ASoC CODEC DRIVER
+M:     Kirill Marinushkin <kmarinushkin@birdec.tech>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/pcm3060.txt
+F:     sound/soc/codecs/pcm3060*
+
 TI TAS571X FAMILY ASoC CODEC DRIVER
 M:     Kevin Cernekee <cernekee@chromium.org>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -15296,6 +15499,12 @@ F:     Documentation/driver-api/usb/typec_bus.rst
 F:     drivers/usb/typec/altmodes/
 F:     include/linux/usb/typec_altmode.h
 
+USB TYPEC PORT CONTROLLER DRIVERS
+M:     Guenter Roeck <linux@roeck-us.net>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/typec/tcpm/
+
 USB UHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
@@ -15370,13 +15579,27 @@ F:    arch/x86/um/
 F:     fs/hostfs/
 F:     fs/hppfs/
 
+USERSPACE COPYIN/COPYOUT (UIOVEC)
+M:     Alexander Viro <viro@zeniv.linux.org.uk>
+S:     Maintained
+F:     lib/iov_iter.c
+F:     include/linux/uio.h
+
+USERSPACE DMA BUFFER DRIVER
+M:     Gerd Hoffmann <kraxel@redhat.com>
+S:     Maintained
+L:     dri-devel@lists.freedesktop.org
+F:     drivers/dma-buf/udmabuf.c
+F:     include/uapi/linux/udmabuf.h
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+
 USERSPACE I/O (UIO)
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 F:     Documentation/driver-api/uio-howto.rst
 F:     drivers/uio/
-F:     include/linux/uio*.h
+F:     include/linux/uio_driver.h
 
 UTIL-LINUX PACKAGE
 M:     Karel Zak <kzak@redhat.com>
@@ -15500,7 +15723,7 @@ M:      Marek Szyprowski <m.szyprowski@samsung.com>
 M:     Kyungmin Park <kyungmin.park@samsung.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/media/v4l2-core/videobuf2-*
+F:     drivers/media/common/videobuf2/*
 F:     include/media/videobuf2-*
 
 VIMC VIRTUAL MEDIA CONTROLLER DRIVER
@@ -15712,7 +15935,7 @@ F:      include/linux/regulator/
 
 VRF
 M:     David Ahern <dsa@cumulusnetworks.com>
-M:     Shrijeet Mukherjee <shm@cumulusnetworks.com>
+M:     Shrijeet Mukherjee <shrijeet@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/vrf.c
@@ -15977,6 +16200,17 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
 S:     Maintained
 F:     arch/x86/entry/vdso/
 
+XARRAY
+M:     Matthew Wilcox <willy@infradead.org>
+L:     linux-fsdevel@vger.kernel.org
+S:     Supported
+F:     Documentation/core-api/xarray.rst
+F:     lib/idr.c
+F:     lib/xarray.c
+F:     include/linux/idr.h
+F:     include/linux/xarray.h
+F:     tools/testing/radix-tree
+
 XC2028/3028 TUNER DRIVER
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
 L:     linux-media@vger.kernel.org