Merge tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git] / MAINTAINERS
index bccced5d131d13253368ac9439e85fbc26b8a202..9b091ef6579b0f8592e35cac37a4b7889570a347 100644 (file)
@@ -766,6 +766,8 @@ F:  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
 F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
 F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
 F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
+F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
 F:     drivers/gpu/drm/amd/amdkfd/
 F:     drivers/gpu/drm/amd/include/cik_structs.h
 F:     drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@ -841,13 +843,6 @@ F: sound/soc/codecs/ad7*
 F:     sound/soc/codecs/ssm*
 F:     sound/soc/codecs/sigmadsp.*
 
-ANALOG DEVICES INC ASOC DRIVERS
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-W:     http://blackfin.uclinux.org/
-S:     Supported
-F:     sound/soc/blackfin/*
-
 ANALOG DEVICES INC DMA DRIVERS
 M:     Lars-Peter Clausen <lars@metafoo.de>
 W:     http://ez.analog.com/community/linux-device-drivers
@@ -866,7 +861,17 @@ F: drivers/iio/*/ad*
 F:     drivers/iio/adc/ltc2497*
 X:     drivers/iio/*/adjd*
 F:     drivers/staging/iio/*/ad*
-F:     drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+
+ANDES ARCHITECTURE
+M:     Greentime Hu <green.hu@gmail.com>
+M:     Vincent Chen <deanbo422@gmail.com>
+T:     git https://github.com/andestech/linux.git
+S:     Supported
+F:     arch/nds32/
+F:     Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
+F:     Documentation/devicetree/bindings/nds32/
+K:     nds32
+N:     nds32
 
 ANDROID CONFIG FRAGMENTS
 M:     Rob Herring <robh@kernel.org>
@@ -929,8 +934,8 @@ F:  drivers/char/apm-emulation.c
 APPARMOR SECURITY MODULE
 M:     John Johansen <john.johansen@canonical.com>
 L:     apparmor@lists.ubuntu.com (subscribers-only, general discussion)
-W:     apparmor.wiki.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+W:     wiki.apparmor.net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
 S:     Supported
 F:     security/apparmor/
 F:     Documentation/admin-guide/LSM/apparmor.rst
@@ -1060,41 +1065,42 @@ ARM PORT
 M:     Russell King <linux@armlinux.org.uk>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.armlinux.org.uk/
-S:     Maintained
+S:     Odd Fixes
 T:     git git://git.armlinux.org.uk/~rmk/linux-arm.git
 F:     arch/arm/
+X:     arch/arm/boot/dts/
 
 ARM PRIMECELL AACI PL041 DRIVER
 M:     Russell King <linux@armlinux.org.uk>
-S:     Maintained
+S:     Odd Fixes
 F:     sound/arm/aaci.*
 
 ARM PRIMECELL BUS SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/amba/
 F:     include/linux/amba/bus.h
 
 ARM PRIMECELL CLCD PL110 DRIVER
 M:     Russell King <linux@armlinux.org.uk>
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/video/fbdev/amba-clcd.*
 
 ARM PRIMECELL KMI PL050 DRIVER
 M:     Russell King <linux@armlinux.org.uk>
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/input/serio/ambakmi.*
 F:     include/linux/amba/kmi.h
 
 ARM PRIMECELL MMCI PL180/1 DRIVER
 M:     Russell King <linux@armlinux.org.uk>
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/mmc/host/mmci.*
 F:     include/linux/amba/mmci.h
 
 ARM PRIMECELL UART PL010 AND PL011 DRIVERS
 M:     Russell King <linux@armlinux.org.uk>
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/tty/serial/amba-pl01*.c
 F:     include/linux/amba/serial.h
 
@@ -1152,7 +1158,7 @@ S:        Maintained
 F:     drivers/clk/sunxi/
 
 ARM/Allwinner sunXi SoC support
-M:     Maxime Ripard <maxime.ripard@free-electrons.com>
+M:     Maxime Ripard <maxime.ripard@bootlin.com>
 M:     Chen-Yu Tsai <wens@csie.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -1226,37 +1232,21 @@ F:      Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
 
 ARM/ASPEED MACHINE SUPPORT
 M:     Joel Stanley <joel@jms.id.au>
-S:     Maintained
+R:     Andrew Jeffery <andrew@aj.id.au>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+Q:     https://patchwork.ozlabs.org/project/linux-aspeed/list/
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 F:     arch/arm/mach-aspeed/
 F:     arch/arm/boot/dts/aspeed-*
-F:     drivers/*/*aspeed*
+N:     aspeed
 
 ARM/ATMEL AT91 Clock Support
-M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+M:     Boris Brezillon <boris.brezillon@bootlin.com>
 S:     Maintained
 F:     drivers/clk/at91
 
-ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
-M:     Nicolas Ferre <nicolas.ferre@microchip.com>
-M:     Alexandre Belloni <alexandre.belloni@free-electrons.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.linux4sam.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
-S:     Supported
-N:     at91
-N:     atmel
-F:     arch/arm/mach-at91/
-F:     include/soc/at91/
-F:     arch/arm/boot/dts/at91*.dts
-F:     arch/arm/boot/dts/at91*.dtsi
-F:     arch/arm/boot/dts/sama*.dts
-F:     arch/arm/boot/dts/sama*.dtsi
-F:     arch/arm/include/debug/at91.S
-F:     drivers/memory/atmel*
-F:     drivers/watchdog/sama5d4_wdt.c
-X:     drivers/input/touchscreen/atmel_mxt_ts.c
-X:     drivers/net/wireless/atmel/
-
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1577,20 +1567,11 @@ ARM/MAGICIAN MACHINE SUPPORT
 M:     Philipp Zabel <philipp.zabel@gmail.com>
 S:     Maintained
 
-ARM/Marvell Berlin SoC support
-M:     Jisheng Zhang <jszhang@marvell.com>
-M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     arch/arm/mach-berlin/
-F:     arch/arm/boot/dts/berlin*
-F:     arch/arm64/boot/dts/marvell/berlin*
-
 ARM/Marvell Dove/MV78xx0/Orion SOC support
 M:     Jason Cooper <jason@lakedaemon.net>
 M:     Andrew Lunn <andrew@lunn.ch>
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-M:     Gregory Clement <gregory.clement@free-electrons.com>
+M:     Gregory Clement <gregory.clement@bootlin.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/soc/dove/
@@ -1604,7 +1585,7 @@ F:        arch/arm/boot/dts/orion5x*
 ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
 M:     Jason Cooper <jason@lakedaemon.net>
 M:     Andrew Lunn <andrew@lunn.ch>
-M:     Gregory Clement <gregory.clement@free-electrons.com>
+M:     Gregory Clement <gregory.clement@bootlin.com>
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -1656,6 +1637,27 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 F:     arch/arm/mach-ks8695/
 S:     Odd Fixes
 
+ARM/Microchip (AT91) SoC support
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
+M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+W:     http://www.linux4sam.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
+S:     Supported
+N:     at91
+N:     atmel
+F:     arch/arm/mach-at91/
+F:     include/soc/at91/
+F:     arch/arm/boot/dts/at91*.dts
+F:     arch/arm/boot/dts/at91*.dtsi
+F:     arch/arm/boot/dts/sama*.dts
+F:     arch/arm/boot/dts/sama*.dtsi
+F:     arch/arm/include/debug/at91.S
+F:     drivers/memory/atmel*
+F:     drivers/watchdog/sama5d4_wdt.c
+X:     drivers/input/touchscreen/atmel_mxt_ts.c
+X:     drivers/net/wireless/atmel/
+
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <robert.jarzmik@free.fr>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1700,6 +1702,20 @@ F:       Documentation/devicetree/bindings/arm/ste-*
 F:     Documentation/devicetree/bindings/arm/ux500/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 
+ARM/NUVOTON NPCM ARCHITECTURE
+M:     Avi Fishman <avifishman70@gmail.com>
+M:     Tomer Maimon <tmaimon77@gmail.com>
+R:     Patrick Venture <venture@google.com>
+R:     Nancy Yuen <yuenn@google.com>
+R:     Brendan Higgins <brendanhiggins@google.com>
+L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
+S:     Supported
+F:     arch/arm/mach-npcm/
+F:     arch/arm/boot/dts/nuvoton-npcm*
+F:     include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
+F:     drivers/*/*npcm*
+F:     Documentation/*/*npcm*
+
 ARM/NUVOTON W90X900 ARM ARCHITECTURE
 M:     Wan ZongShun <mcuos.com@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1710,7 +1726,7 @@ F:        drivers/input/keyboard/w90p910_keypad.c
 F:     drivers/input/touchscreen/w90p910_ts.c
 F:     drivers/watchdog/nuc900_wdt.c
 F:     drivers/net/ethernet/nuvoton/w90p910_ether.c
-F:     drivers/mtd/nand/nuc900_nand.c
+F:     drivers/mtd/nand/raw/nuc900_nand.c
 F:     drivers/rtc/rtc-nuc900.c
 F:     drivers/spi/spi-nuc900.c
 F:     drivers/usb/host/ehci-w90x900.c
@@ -1732,7 +1748,7 @@ F:        arch/arm/mach-orion5x/ts78xx-*
 ARM/OXNAS platform support
 M:     Neil Armstrong <narmstrong@baylibre.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
+L:     linux-oxnas@groups.io (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-oxnas/
 F:     arch/arm/boot/dts/ox8*.dts*
@@ -1863,7 +1879,6 @@ Q:        https://patchwork.kernel.org/project/linux-samsung-soc/list/
 S:     Maintained
 F:     arch/arm/boot/dts/s3c*
 F:     arch/arm/boot/dts/s5p*
-F:     arch/arm/boot/dts/samsung*
 F:     arch/arm/boot/dts/exynos*
 F:     arch/arm64/boot/dts/exynos/
 F:     arch/arm/plat-samsung/
@@ -1963,6 +1978,14 @@ M:       Thor Thayer <thor.thayer@linux.intel.com>
 S:     Maintained
 F:     drivers/edac/altera_edac.
 
+ARM/SPREADTRUM SoC SUPPORT
+M:     Orson Zhai <orsonzhai@gmail.com>
+M:     Baolin Wang <baolin.wang@linaro.org>
+M:     Chunyan Zhang <zhang.lyra@gmail.com>
+S:     Maintained
+F:     arch/arm64/boot/dts/sprd
+N:     sprd
+
 ARM/STI ARCHITECTURE
 M:     Patrice Chotard <patrice.chotard@st.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1999,10 +2022,21 @@ M:      Maxime Coquelin <mcoquelin.stm32@gmail.com>
 M:     Alexandre Torgue <alexandre.torgue@st.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
 N:     stm32
+F:     arch/arm/boot/dts/stm32*
+F:     arch/arm/mach-stm32/
 F:     drivers/clocksource/armv7m_systick.c
 
+ARM/Synaptics Berlin SoC support
+M:     Jisheng Zhang <Jisheng.Zhang@synaptics.com>
+M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-berlin/
+F:     arch/arm/boot/dts/berlin*
+F:     arch/arm64/boot/dts/marvell/berlin*
+
 ARM/TANGO ARCHITECTURE
 M:     Marc Gonzalez <marc.w.gonzalez@free.fr>
 M:     Mans Rullgard <mans@mansr.com>
@@ -2475,7 +2509,6 @@ M:        Paul Moore <paul@paul-moore.com>
 M:     Eric Paris <eparis@redhat.com>
 L:     linux-audit@redhat.com (moderated for non-subscribers)
 W:     https://github.com/linux-audit
-W:     https://people.redhat.com/sgrubb/audit
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
 S:     Supported
 F:     include/linux/audit.h
@@ -2627,51 +2660,6 @@ F:       Documentation/filesystems/bfs.txt
 F:     fs/bfs/
 F:     include/uapi/linux/bfs_fs.h
 
-BLACKFIN ARCHITECTURE
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-T:     git git://git.code.sf.net/p/adi-linux/code
-W:     http://blackfin.uclinux.org
-S:     Orphan
-F:     arch/blackfin/
-
-BLACKFIN EMAC DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://blackfin.uclinux.org
-S:     Orphan
-F:     drivers/net/ethernet/adi/
-
-BLACKFIN MEDIA DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://blackfin.uclinux.org/
-S:     Orphan
-F:     drivers/media/platform/blackfin/
-F:     drivers/media/i2c/adv7183*
-F:     drivers/media/i2c/vs6624*
-
-BLACKFIN RTC DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://blackfin.uclinux.org
-S:     Orphan
-F:     drivers/rtc/rtc-bfin.c
-
-BLACKFIN SDH DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://blackfin.uclinux.org
-S:     Orphan
-F:     drivers/mmc/host/bfin_sdh.c
-
-BLACKFIN SERIAL DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://blackfin.uclinux.org
-S:     Orphan
-F:     drivers/tty/serial/bfin_uart.c
-
-BLACKFIN WATCHDOG DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://blackfin.uclinux.org
-S:     Orphan
-F:     drivers/watchdog/bfin_wdt.c
-
 BLINKM RGB LED DRIVER
 M:     Jan-Simon Moeller <jansimon.moeller@gmx.de>
 S:     Maintained
@@ -2683,6 +2671,7 @@ L:        linux-block@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:     Maintained
 F:     block/
+F:     drivers/block/
 F:     kernel/trace/blktrace.c
 F:     lib/sbitmap.c
 
@@ -3014,7 +3003,7 @@ M:        Kamal Dasu <kdasu.kdev@gmail.com>
 L:     linux-mtd@lists.infradead.org
 L:     bcm-kernel-feedback-list@broadcom.com
 S:     Maintained
-F:     drivers/mtd/nand/brcmnand/
+F:     drivers/mtd/nand/raw/brcmnand/
 
 BROADCOM STB DPFE DRIVER
 M:     Markus Mayer <mmayer@broadcom.com>
@@ -3282,12 +3271,11 @@ F:      drivers/net/ieee802154/cc2520.c
 F:     include/linux/spi/cc2520.h
 F:     Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 
-CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
+CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
 M:     Gilad Ben-Yossef <gilad@benyossef.com>
 L:     linux-crypto@vger.kernel.org
-L:     driverdev-devel@linuxdriverproject.org
 S:     Supported
-F:     drivers/staging/ccree/
+F:     drivers/crypto/ccree/
 W:     https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 
 CEC FRAMEWORK
@@ -3305,6 +3293,7 @@ F:        include/media/cec-notifier.h
 F:     include/uapi/linux/cec.h
 F:     include/uapi/linux/cec-funcs.h
 F:     Documentation/devicetree/bindings/media/cec.txt
+F:     Documentation/ABI/testing/debugfs-cec-error-inj
 
 CEC GPIO DRIVER
 M:     Hans Verkuil <hans.verkuil@cisco.com>
@@ -3747,16 +3736,6 @@ S:       Maintained
 F:     Documentation/filesystems/cramfs.txt
 F:     fs/cramfs/
 
-CRIS PORT
-M:     Mikael Starvik <starvik@axis.com>
-M:     Jesper Nilsson <jesper.nilsson@axis.com>
-L:     linux-cris-kernel@axis.com
-W:     http://developer.axis.com
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
-S:     Maintained
-F:     arch/cris/
-F:     drivers/tty/serial/crisv10.*
-
 CRYPTO API
 M:     Herbert Xu <herbert@gondor.apana.org.au>
 M:     "David S. Miller" <davem@davemloft.net>
@@ -4116,10 +4095,10 @@ DENALI NAND DRIVER
 M:     Masahiro Yamada <yamada.masahiro@socionext.com>
 L:     linux-mtd@lists.infradead.org
 S:     Supported
-F:     drivers/mtd/nand/denali*
+F:     drivers/mtd/nand/raw/denali*
 
 DESIGNWARE USB2 DRD IP DRIVER
-M:     John Youn <johnyoun@synopsys.com>
+M:     Minas Harutyunyan <hminas@synopsys.com>
 L:     linux-usb@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:     Maintained
@@ -4333,6 +4312,7 @@ Q:        https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:     Maintained
 F:     drivers/dma/
 F:     include/linux/dmaengine.h
+F:     include/linux/of_dma.h
 F:     Documentation/devicetree/bindings/dma/
 F:     Documentation/driver-api/dmaengine/
 T:     git git://git.infradead.org/users/vkoul/slave-dma.git
@@ -4410,8 +4390,14 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/fsl-dpaa2/ethernet
 
+DPAA2 ETHERNET SWITCH DRIVER
+M:     Razvan Stefanescu <razvan.stefanescu@nxp.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/fsl-dpaa2/ethsw
+
 DPT_I2O SCSI RAID DRIVER
-M:     Adaptec OEM Raid Solutions <aacraid@adaptec.com>
+M:     Adaptec OEM Raid Solutions <aacraid@microsemi.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.adaptec.com/
 S:     Maintained
@@ -4456,6 +4442,13 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Supported
 F:     drivers/gpu/drm/pl111/
 
+DRM DRIVER FOR ARM VERSATILE TFT 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-arm-versatile.c
+F:     Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
+
 DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 M:     Dave Airlie <airlied@redhat.com>
 S:     Odd Fixes
@@ -4610,8 +4603,8 @@ F:        include/uapi/drm/
 F:     include/linux/vga*
 
 DRM DRIVERS AND MISC GPU PATCHES
-M:     Daniel Vetter <daniel.vetter@intel.com>
 M:     Gustavo Padovan <gustavo@padovan.org>
+M:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 M:     Sean Paul <seanpaul@chromium.org>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
@@ -4624,7 +4617,7 @@ F:        include/uapi/drm/drm*
 F:     include/linux/vga*
 
 DRM DRIVERS FOR ALLWINNER A10
-M:     Maxime Ripard  <maxime.ripard@free-electrons.com>
+M:     Maxime Ripard  <maxime.ripard@bootlin.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
 F:     drivers/gpu/drm/sun4i/
@@ -4644,7 +4637,7 @@ F:        Documentation/gpu/meson.rst
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR ATMEL HLCDC
-M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+M:     Boris Brezillon <boris.brezillon@bootlin.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
 F:     drivers/gpu/drm/atmel-hlcdc/
@@ -4737,6 +4730,7 @@ F:        drivers/gpu/drm/rcar-du/
 F:     drivers/gpu/drm/shmobile/
 F:     include/linux/platform_data/shmob_drm.h
 F:     Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
+F:     Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
 F:     Documentation/devicetree/bindings/display/renesas,du.txt
 
 DRM DRIVERS FOR ROCKCHIP
@@ -5003,12 +4997,6 @@ T:       git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/tuners/e4000*
 
-EATA ISA/EISA/PCI SCSI DRIVER
-M:     Dario Ballabio <ballabio_dario@emc.com>
-L:     linux-scsi@vger.kernel.org
-S:     Maintained
-F:     drivers/scsi/eata.c
-
 EC100 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -5550,7 +5538,7 @@ M:        Luis R. Rodriguez <mcgrof@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/firmware_class/
-F:     drivers/base/firmware*.c
+F:     drivers/base/firmware_loader/
 F:     include/linux/firmware.h
 
 FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
@@ -5635,7 +5623,7 @@ S:        Maintained
 F:     drivers/dma/fsldma.*
 
 FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
-M:     Claudiu Manoil <claudiu.manoil@freescale.com>
+M:     Claudiu Manoil <claudiu.manoil@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/freescale/gianfar*
@@ -5646,7 +5634,7 @@ FREESCALE GPMI NAND DRIVER
 M:     Han Xu <han.xu@nxp.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
-F:     drivers/mtd/nand/gpmi-nand/*
+F:     drivers/mtd/nand/raw/gpmi-nand/*
 
 FREESCALE I2C CPM DRIVER
 M:     Jochen Friedrich <jochen@scram.de>
@@ -5797,10 +5785,6 @@ F:       fs/crypto/
 F:     include/linux/fscrypt*.h
 F:     Documentation/filesystems/fscrypt.rst
 
-FUJITSU FR-V (FRV) PORT
-S:     Orphan
-F:     arch/frv/
-
 FUJITSU LAPTOP EXTRAS
 M:     Jonathan Woithe <jwoithe@just42.net>
 L:     platform-driver-x86@vger.kernel.org
@@ -5848,12 +5832,6 @@ F:       tools/testing/selftests/futex/
 F:     tools/perf/bench/futex*
 F:     Documentation/*futex*
 
-FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
-M:     Rik Faith <faith@cs.unc.edu>
-L:     linux-scsi@vger.kernel.org
-S:     Odd Fixes (e.g., new signatures)
-F:     drivers/scsi/fdomain.*
-
 GCC PLUGINS
 M:     Kees Cook <keescook@chromium.org>
 R:     Emese Revfy <re.emese@gmail.com>
@@ -5865,7 +5843,7 @@ F:        scripts/Makefile.gcc-plugins
 F:     Documentation/gcc-plugins.txt
 
 GCOV BASED KERNEL PROFILING
-M:     Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+M:     Peter Oberparleiter <oberpar@linux.ibm.com>
 S:     Maintained
 F:     kernel/gcov/
 F:     Documentation/dev-tools/gcov.rst
@@ -5933,6 +5911,11 @@ S:       Supported
 F:     drivers/phy/
 F:     include/linux/phy/
 
+GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/muxes/i2c-demux-pinctrl.c
+
 GENERIC PM DOMAINS
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Kevin Hilman <khilman@kernel.org>
@@ -6014,7 +5997,7 @@ S:        Maintained
 F:     drivers/media/rc/gpio-ir-tx.c
 
 GPIO MOCKUP DRIVER
-M:     Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
+M:     Bamvor Jian Zhang <bamv2005@gmail.com>
 R:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
@@ -6027,12 +6010,14 @@ L:      linux-gpio@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/
+F:     Documentation/driver-api/gpio/
 F:     Documentation/gpio/
 F:     Documentation/ABI/testing/gpio-cdev
 F:     Documentation/ABI/obsolete/sysfs-gpio
 F:     drivers/gpio/
 F:     include/linux/gpio/
 F:     include/linux/gpio.h
+F:     include/linux/of_gpio.h
 F:     include/asm-generic/gpio.h
 F:     include/uapi/linux/gpio.h
 F:     tools/gpio/
@@ -6242,6 +6227,11 @@ F:       Documentation/hw_random.txt
 F:     drivers/char/hw_random/
 F:     include/linux/hw_random.h
 
+HARDWARE TRACING FACILITIES
+M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
+S:     Maintained
+F:     drivers/hwtracing/
+
 HARDWARE SPINLOCK CORE
 M:     Ohad Ben-Cohen <ohad@wizery.com>
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
@@ -6386,6 +6376,13 @@ W:       http://www.hisilicon.com
 S:     Maintained
 F:     drivers/net/ethernet/hisilicon/hns3/
 
+HISILICON LPC BUS DRIVER
+M:     john.garry@huawei.com
+W:     http://www.hisilicon.com
+S:     Maintained
+F:     drivers/bus/hisi_lpc.c
+F:     Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
+
 HISILICON NETWORK SUBSYSTEM DRIVER
 M:     Yisen Zhuang <yisen.zhuang@huawei.com>
 M:     Salil Mehta <salil.mehta@huawei.com>
@@ -6423,6 +6420,7 @@ L:        linux-mm@kvack.org
 S:     Maintained
 F:     mm/hmm*
 F:     include/linux/hmm*
+F:     Documentation/vm/hmm.txt
 
 HOST AP DRIVER
 M:     Jouni Malinen <j@w1.fi>
@@ -6529,7 +6527,7 @@ S:        Maintained
 F:     Documentation/networking/netvsc.txt
 F:     arch/x86/include/asm/mshyperv.h
 F:     arch/x86/include/asm/trace/hyperv.h
-F:     arch/x86/include/uapi/asm/hyperv.h
+F:     arch/x86/include/asm/hyperv-tlfs.h
 F:     arch/x86/kernel/cpu/mshyperv.c
 F:     arch/x86/hyperv
 F:     drivers/hid/hid-hyperv.c
@@ -6572,7 +6570,7 @@ F:        drivers/i2c/muxes/
 F:     include/linux/i2c-mux.h
 
 I2C MV64XXX MARVELL AND ALLWINNER DRIVER
-M:     Gregory CLEMENT <gregory.clement@free-electrons.com>
+M:     Gregory CLEMENT <gregory.clement@bootlin.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-mv64xxx.c
@@ -6593,15 +6591,25 @@ W:      https://i2c.wiki.kernel.org/
 Q:     https://patchwork.ozlabs.org/project/linux-i2c/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/
+F:     Documentation/devicetree/bindings/i2c/i2c.txt
 F:     Documentation/i2c/
-F:     drivers/i2c/
-F:     drivers/i2c/*/
+F:     drivers/i2c/*
 F:     include/linux/i2c.h
-F:     include/linux/i2c-*.h
+F:     include/linux/i2c-dev.h
+F:     include/linux/i2c-smbus.h
 F:     include/uapi/linux/i2c.h
 F:     include/uapi/linux/i2c-*.h
 
+I2C SUBSYSTEM HOST DRIVERS
+L:     linux-i2c@vger.kernel.org
+W:     https://i2c.wiki.kernel.org/
+Q:     https://patchwork.ozlabs.org/project/linux-i2c/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
+S:     Odd Fixes
+F:     Documentation/devicetree/bindings/i2c/
+F:     drivers/i2c/algos/
+F:     drivers/i2c/busses/
+
 I2C-TAOS-EVM DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
@@ -6901,6 +6909,13 @@ M:       James Hogan <jhogan@kernel.org>
 S:     Maintained
 F:     drivers/media/rc/img-ir/
 
+IMON SOUNDGRAPH USB IR RECEIVER
+M:     Sean Young <sean@mess.org>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/rc/imon_raw.c
+F:     drivers/media/rc/imon.c
+
 IMS TWINTURBO FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
@@ -6955,7 +6970,7 @@ INGENIC JZ4780 NAND DRIVER
 M:     Harvey Hunt <harveyhuntnexus@gmail.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
-F:     drivers/mtd/nand/jz4780_*
+F:     drivers/mtd/nand/raw/jz4780_*
 
 INOTIFY
 M:     Jan Kara <jack@suse.cz>
@@ -6990,7 +7005,7 @@ F:        drivers/input/input-mt.c
 K:     \b(ABS|SYN)_MT_
 
 INSIDE SECURE CRYPTO DRIVER
-M:     Antoine Tenart <antoine.tenart@free-electrons.com>
+M:     Antoine Tenart <antoine.tenart@bootlin.com>
 F:     drivers/crypto/inside-secure/
 S:     Maintained
 L:     linux-crypto@vger.kernel.org
@@ -7061,6 +7076,7 @@ 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:     drivers/net/ethernet/intel/
 F:     drivers/net/ethernet/intel/*/
 F:     include/linux/avf/virtchnl.h
@@ -7226,6 +7242,15 @@ M:       Shiraz Saleem <shiraz.saleem@intel.com>
 L:     linux-rdma@vger.kernel.org
 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>
@@ -7321,6 +7346,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/iommu/
 F:     drivers/iommu/
 F:     include/linux/iommu.h
+F:     include/linux/of_iommu.h
 F:     include/linux/iova.h
 
 IP MASQUERADING
@@ -7339,7 +7365,7 @@ F:        include/linux/ipmi*
 F:     include/uapi/linux/ipmi*
 
 IPS SCSI RAID DRIVER
-M:     Adaptec OEM Raid Solutions <aacraid@adaptec.com>
+M:     Adaptec OEM Raid Solutions <aacraid@microsemi.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.adaptec.com/
 S:     Maintained
@@ -7521,6 +7547,13 @@ Q:       http://patchwork.linuxtv.org/project/linux-media/list/
 S:     Maintained
 F:     drivers/media/dvb-frontends/ix2505v*
 
+JAILHOUSE HYPERVISOR INTERFACE
+M:     Jan Kiszka <jan.kiszka@siemens.com>
+L:     jailhouse-dev@googlegroups.com
+S:     Maintained
+F:     arch/x86/kernel/jailhouse.c
+F:     arch/x86/include/asm/jailhouse_para.h
+
 JC42.4 TEMPERATURE SENSOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -7600,8 +7633,10 @@ F:       mm/kasan/
 F:     scripts/Makefile.kasan
 
 KCONFIG
+M:     Masahiro Yamada <yamada.masahiro@socionext.com>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
 L:     linux-kbuild@vger.kernel.org
-S:     Orphan
+S:     Maintained
 F:     Documentation/kbuild/kconfig-language.txt
 F:     scripts/kconfig/
 
@@ -7748,7 +7783,7 @@ F:        arch/powerpc/kernel/kvm*
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
-M:     Janosch Frank <frankja@linux.vnet.ibm.com>
+M:     Janosch Frank <frankja@linux.ibm.com>
 R:     David Hildenbrand <david@redhat.com>
 R:     Cornelia Huck <cohuck@redhat.com>
 L:     linux-s390@vger.kernel.org
@@ -7905,11 +7940,13 @@ F:      drivers/scsi/53c700*
 
 LEAKING_ADDRESSES
 M:     Tobin C. Harding <me@tobin.cc>
+M:     Tycho Andersen <tycho@tycho.ws>
+L:     kernel-hardening@lists.openwall.com
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
 F:     scripts/leaking_addresses.pl
 
 LED SUBSYSTEM
-M:     Richard Purdie <rpurdie@rpsys.net>
 M:     Jacek Anaszewski <jacek.anaszewski@gmail.com>
 M:     Pavel Machek <pavel@ucw.cz>
 L:     linux-leds@vger.kernel.org
@@ -8032,6 +8069,14 @@ Q:       https://patchwork.kernel.org/project/linux-nvdimm/list/
 S:     Supported
 F:     drivers/nvdimm/pmem*
 
+LIBNVDIMM: DEVICETREE BINDINGS
+M:     Oliver O'Halloran <oohall@gmail.com>
+L:     linux-nvdimm@lists.01.org
+Q:     https://patchwork.kernel.org/project/linux-nvdimm/list/
+S:     Supported
+F:     drivers/nvdimm/of_pmem.c
+F:     Documentation/devicetree/bindings/pmem/pmem-region.txt
+
 LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 M:     Dan Williams <dan.j.williams@intel.com>
 L:     linux-nvdimm@lists.01.org
@@ -8146,7 +8191,25 @@ F:       drivers/*/*/*pasemi*
 LINUX KERNEL DUMP TEST MODULE (LKDTM)
 M:     Kees Cook <keescook@chromium.org>
 S:     Maintained
-F:     drivers/misc/lkdtm*
+F:     drivers/misc/lkdtm/*
+
+LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
+M:     Alan Stern <stern@rowland.harvard.edu>
+M:     Andrea Parri <parri.andrea@gmail.com>
+M:     Will Deacon <will.deacon@arm.com>
+M:     Peter Zijlstra <peterz@infradead.org>
+M:     Boqun Feng <boqun.feng@gmail.com>
+M:     Nicholas Piggin <npiggin@gmail.com>
+M:     David Howells <dhowells@redhat.com>
+M:     Jade Alglave <j.alglave@ucl.ac.uk>
+M:     Luc Maranget <luc.maranget@inria.fr>
+M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+R:     Akira Yokosawa <akiyks@gmail.com>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:     tools/memory-model/
+F:     Documentation/memory-barriers.txt
 
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:     Chris Wright <chrisw@sous-sol.org>
@@ -8309,11 +8372,6 @@ W:       http://linux-test-project.github.io/
 T:     git git://github.com/linux-test-project/ltp.git
 S:     Maintained
 
-M32R ARCHITECTURE
-W:     http://www.linux-m32r.org/
-S:     Orphan
-F:     arch/m32r/
-
 M68K ARCHITECTURE
 M:     Geert Uytterhoeven <geert@linux-m68k.org>
 L:     linux-m68k@lists.linux-m68k.org
@@ -8412,7 +8470,7 @@ F:        include/uapi/drm/armada_drm.h
 F:     Documentation/devicetree/bindings/display/armada/
 
 MARVELL CRYPTO DRIVER
-M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+M:     Boris Brezillon <boris.brezillon@bootlin.com>
 M:     Arnaud Ebalard <arno@natisbad.org>
 F:     drivers/crypto/marvell/
 S:     Maintained
@@ -8431,7 +8489,7 @@ S:        Orphan
 F:     drivers/net/wireless/marvell/libertas/
 
 MARVELL MACCHIATOBIN SUPPORT
-M:     Russell King <rmk@armlinux.org.uk>
+M:     Russell King <linux@armlinux.org.uk>
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
 F:     arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -8444,7 +8502,7 @@ F:        drivers/net/ethernet/marvell/mv643xx_eth.*
 F:     include/linux/mv643xx.h
 
 MARVELL MV88X3310 PHY DRIVER
-M:     Russell King <rmk@armlinux.org.uk>
+M:     Russell King <linux@armlinux.org.uk>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/phy/marvell10g.c
@@ -8471,10 +8529,10 @@ S:      Odd Fixes
 F:     drivers/net/wireless/marvell/mwl8k.c
 
 MARVELL NAND CONTROLLER DRIVER
-M:     Miquel Raynal <miquel.raynal@free-electrons.com>
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
-F:     drivers/mtd/nand/marvell_nand.c
+F:     drivers/mtd/nand/raw/marvell_nand.c
 F:     Documentation/devicetree/bindings/mtd/marvell-nand.txt
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -8586,13 +8644,23 @@ W:      https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-maxiradio*
 
-MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
+MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
+F:     drivers/iio/potentiometer/mcp4018.c
 F:     drivers/iio/potentiometer/mcp4531.c
 
+MCR20A IEEE-802.15.4 RADIO DRIVER
+M:     Xue Liu <liuxuenetmail@gmail.com>
+L:     linux-wpan@vger.kernel.org
+W:     https://github.com/xueliu/mcr20a-linux
+S:     Maintained
+F:     drivers/net/ieee802154/mcr20a.c
+F:     drivers/net/ieee802154/mcr20a.h
+F:     Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
+
 MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
 M:     William Breathitt Gray <vilhelm.gray@gmail.com>
 L:     linux-iio@vger.kernel.org
@@ -8609,6 +8677,14 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Supported
 F:     drivers/media/dvb-frontends/ascot2e*
 
+MEDIA DRIVERS FOR CXD2099AR CI CONTROLLERS
+M:     Jasmin Jessich <jasmin@anw.at>
+L:     linux-media@vger.kernel.org
+W:     https://linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/dvb-frontends/cxd2099*
+
 MEDIA DRIVERS FOR CXD2841ER
 M:     Sergey Kozlov <serjk@netup.ru>
 M:     Abylay Ospan <aospan@netup.ru>
@@ -8619,6 +8695,15 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Supported
 F:     drivers/media/dvb-frontends/cxd2841er*
 
+MEDIA DRIVERS FOR CXD2880
+M:     Yasunari Takiguchi <Yasunari.Takiguchi@sony.com>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+T:     git git://linuxtv.org/media_tree.git
+S:     Supported
+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
@@ -8686,6 +8771,16 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Supported
 F:     drivers/media/pci/netup_unidvb/*
 
+MEDIA DRIVERS FOR RENESAS - CEU
+M:     Jacopo Mondi <jacopo@jmondi.org>
+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:     drivers/media/platform/renesas-ceu.c
+F:     include/media/drv-intf/renesas-ceu.h
+
 MEDIA DRIVERS FOR RENESAS - DRIF
 M:     Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 L:     linux-media@vger.kernel.org
@@ -8887,6 +8982,13 @@ W:       http://www.melexis.com
 S:     Supported
 F:     drivers/iio/temperature/mlx90614.c
 
+MELEXIS MLX90632 DRIVER
+M:     Crt Mori <cmo@melexis.com>
+L:     linux-iio@vger.kernel.org
+W:     http://www.melexis.com
+S:     Supported
+F:     drivers/iio/temperature/mlx90632.c
+
 MELFAS MIP4 TOUCHSCREEN DRIVER
 M:     Sangwon Jee <jeesw@melfas.com>
 W:     http://www.melfas.com
@@ -9012,6 +9114,7 @@ M:        Vadim Pasternak <vadimp@mellanox.com>
 L:     linux-leds@vger.kernel.org
 S:     Supported
 F:     drivers/leds/leds-mlxcpld.c
+F:     drivers/leds/leds-mlxreg.c
 F:     Documentation/leds/leds-mlxcpld.txt
 
 MELLANOX PLATFORM DRIVER
@@ -9043,10 +9146,9 @@ F:       mm/
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:     David Woodhouse <dwmw2@infradead.org>
 M:     Brian Norris <computersforpeace@gmail.com>
-M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+M:     Boris Brezillon <boris.brezillon@bootlin.com>
 M:     Marek Vasut <marek.vasut@gmail.com>
 M:     Richard Weinberger <richard@nod.at>
-M:     Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
 L:     linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
@@ -9090,20 +9192,6 @@ F:       drivers/media/platform/meson/ao-cec.c
 F:     Documentation/devicetree/bindings/media/meson-ao-cec.txt
 T:     git git://linuxtv.org/media_tree.git
 
-METAG ARCHITECTURE
-M:     James Hogan <jhogan@kernel.org>
-L:     linux-metag@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
-S:     Odd Fixes
-F:     arch/metag/
-F:     Documentation/metag/
-F:     Documentation/devicetree/bindings/metag/
-F:     Documentation/devicetree/bindings/interrupt-controller/img,*
-F:     drivers/clocksource/metag_generic.c
-F:     drivers/irqchip/irq-metag.c
-F:     drivers/irqchip/irq-metag-ext.c
-F:     drivers/tty/metag_da.c
-
 MICROBLAZE ARCHITECTURE
 M:     Michal Simek <monstr@monstr.eu>
 W:     http://www.monstr.eu/fdt/
@@ -9145,7 +9233,7 @@ M:        Wenyou Yang <wenyou.yang@microchip.com>
 M:     Josh Wu <rainyfeeling@outlook.com>
 L:     linux-mtd@lists.infradead.org
 S:     Supported
-F:     drivers/mtd/nand/atmel/*
+F:     drivers/mtd/nand/raw/atmel/*
 F:     Documentation/devicetree/bindings/mtd/atmel-nand.txt
 
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
@@ -9158,6 +9246,13 @@ F:       drivers/net/dsa/microchip/*
 F:     include/linux/platform_data/microchip-ksz.h
 F:     Documentation/devicetree/bindings/net/dsa/ksz.txt
 
+MICROCHIP LAN743X ETHERNET DRIVER
+M:     Bryan Whitehead <bryan.whitehead@microchip.com>
+M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/microchip/lan743x_*
+
 MICROCHIP USB251XB DRIVER
 M:     Richard Leitner <richard.leitner@skidata.com>
 L:     linux-usb@vger.kernel.org
@@ -9165,6 +9260,15 @@ S:       Maintained
 F:     drivers/usb/misc/usb251xb.c
 F:     Documentation/devicetree/bindings/usb/usb251xb.txt
 
+MICROSEMI MIPS SOCS
+M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
+L:     linux-mips@linux-mips.org
+S:     Maintained
+F:     arch/mips/generic/board-ocelot.c
+F:     arch/mips/configs/generic/board-ocelot.config
+F:     arch/mips/boot/dts/mscc/
+F:     Documentation/devicetree/bindings/mips/mscc.txt
+
 MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 M:     Don Brace <don.brace@microsemi.com>
 L:     esc.storagedev@microsemi.com
@@ -9215,6 +9319,7 @@ MIPS GENERIC PLATFORM
 M:     Paul Burton <paul.burton@mips.com>
 L:     linux-mips@linux-mips.org
 S:     Supported
+F:     Documentation/devicetree/bindings/power/mti,mips-cpc.txt
 F:     arch/mips/generic/
 F:     arch/mips/tools/generic-board-config.sh
 
@@ -9384,6 +9489,14 @@ S:       Maintained
 F:     drivers/media/i2c/mt9t001.c
 F:     include/media/i2c/mt9t001.h
 
+MT9T112 APTINA CAMERA SENSOR
+M:     Jacopo Mondi <jacopo@jmondi.org>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Odd Fixes
+F:     drivers/media/i2c/mt9t112.c
+F:     include/media/i2c/mt9t112.h
+
 MT9V032 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -9461,7 +9574,7 @@ S:        Supported
 F:     drivers/net/ethernet/myricom/myri10ge/
 
 NAND FLASH SUBSYSTEM
-M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+M:     Boris Brezillon <boris.brezillon@bootlin.com>
 R:     Richard Weinberger <richard@nod.at>
 L:     linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
@@ -9930,6 +10043,13 @@ F:      Documentation/ABI/stable/sysfs-bus-nvmem
 F:     include/linux/nvmem-consumer.h
 F:     include/linux/nvmem-provider.h
 
+NXP SGTL5000 DRIVER
+M:     Fabio Estevam <fabio.estevam@nxp.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/sgtl5000.txt
+F:     sound/soc/codecs/sgtl5000*
+
 NXP TDA998X DRM DRIVER
 M:     Russell King <linux@armlinux.org.uk>
 S:     Supported
@@ -9954,6 +10074,7 @@ F:       drivers/nfc/nxp-nci
 
 OBJTOOL
 M:     Josh Poimboeuf <jpoimboe@redhat.com>
+M:     Peter Zijlstra <peterz@infradead.org>
 S:     Supported
 F:     tools/objtool/
 
@@ -10181,6 +10302,13 @@ T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/i2c/ov13858.c
 
+OMNIVISION OV2685 SENSOR DRIVER
+M:     Shunqian Zheng <zhengsq@rock-chips.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov2685.c
+
 OMNIVISION OV5640 SENSOR DRIVER
 M:     Steve Longerbeam <slongerbeam@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -10195,6 +10323,13 @@ T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/i2c/ov5647.c
 
+OMNIVISION OV5695 SENSOR DRIVER
+M:     Shunqian Zheng <zhengsq@rock-chips.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov5695.c
+
 OMNIVISION OV7670 SENSOR DRIVER
 M:     Jonathan Corbet <corbet@lwn.net>
 L:     linux-media@vger.kernel.org
@@ -10203,6 +10338,14 @@ S:     Maintained
 F:     drivers/media/i2c/ov7670.c
 F:     Documentation/devicetree/bindings/media/i2c/ov7670.txt
 
+OMNIVISION OV772x SENSOR DRIVER
+M:     Jacopo Mondi <jacopo@jmondi.org>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Odd fixes
+F:     drivers/media/i2c/ov772x.c
+F:     include/media/i2c/ov772x.h
+
 OMNIVISION OV7740 SENSOR DRIVER
 M:     Wenyou Yang <wenyou.yang@microchip.com>
 L:     linux-media@vger.kernel.org
@@ -10211,11 +10354,21 @@ S:    Maintained
 F:     drivers/media/i2c/ov7740.c
 F:     Documentation/devicetree/bindings/media/i2c/ov7740.txt
 
+OMNIVISION OV9650 SENSOR DRIVER
+M:     Sakari Ailus <sakari.ailus@linux.intel.com>
+R:     Akinobu Mita <akinobu.mita@gmail.com>
+R:     Sylwester Nawrocki <s.nawrocki@samsung.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov9650.c
+F:     Documentation/devicetree/bindings/media/i2c/ov9650.txt
+
 ONENAND FLASH DRIVER
 M:     Kyungmin Park <kyungmin.park@samsung.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
-F:     drivers/mtd/onenand/
+F:     drivers/mtd/nand/onenand/
 F:     include/linux/mtd/onenand*.h
 
 ONSTREAM SCSI TAPE DRIVER
@@ -10331,7 +10484,7 @@ F:      drivers/oprofile/
 F:     include/linux/oprofile.h
 
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
-M:     Mark Fasheh <mfasheh@versity.com>
+M:     Mark Fasheh <mark@fasheh.com>
 M:     Joel Becker <jlbec@evilplan.org>
 L:     ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:     http://ocfs2.wiki.kernel.org
@@ -10412,14 +10565,6 @@ L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/panasonic-laptop.c
 
-PANASONIC MN10300/AM33/AM34 PORT
-M:     David Howells <dhowells@redhat.com>
-L:     linux-am33-list@redhat.com (moderated for non-subscribers)
-W:     ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
-S:     Maintained
-F:     Documentation/mn10300/
-F:     arch/mn10300/
-
 PARALLEL LCD/KEYPAD PANEL DRIVER
 M:     Willy Tarreau <willy@haproxy.com>
 M:     Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
@@ -10720,6 +10865,7 @@ F:      drivers/acpi/pci*
 F:     drivers/pci/
 F:     include/asm-generic/pci*
 F:     include/linux/pci*
+F:     include/linux/of_pci.h
 F:     include/uapi/linux/pci*
 F:     lib/pci*
 F:     arch/x86/pci/
@@ -10731,6 +10877,7 @@ 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/
 S:     Supported
+F:     drivers/pci/cadence/
 F:     drivers/pci/host/
 F:     drivers/pci/dwc/
 
@@ -10841,6 +10988,7 @@ F:      drivers/platform/x86/peaq-wmi.c
 PER-CPU MEMORY ALLOCATOR
 M:     Tejun Heo <tj@kernel.org>
 M:     Christoph Lameter <cl@linux.com>
+M:     Dennis Zhou <dennisszhou@gmail.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
 S:     Maintained
 F:     include/linux/percpu*.h
@@ -10934,6 +11082,17 @@ L:     linux-gpio@vger.kernel.org
 S:     Supported
 F:     drivers/pinctrl/pinctrl-at91-pio4.*
 
+PIN CONTROLLER - FREESCALE
+M:     Dong Aisheng <aisheng.dong@nxp.com>
+M:     Fabio Estevam <festevam@gmail.com>
+M:     Shawn Guo <shawnguo@kernel.org>
+M:     Stefan Agner <stefan@agner.ch>
+R:     Pengutronix Kernel Team <kernel@pengutronix.de>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/pinctrl/freescale/
+F:     Documentation/devicetree/bindings/pinctrl/fsl,*
+
 PIN CONTROLLER - INTEL
 M:     Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
@@ -11010,7 +11169,7 @@ F:      include/linux/pktcdvd.h
 F:     include/uapi/linux/pktcdvd.h
 
 PKUNITY SOC DRIVERS
-M:     Guan Xuetao <gxt@mprc.pku.edu.cn>
+M:     Guan Xuetao <gxt@pku.edu.cn>
 W:     http://mprc.pku.edu.cn/~guanxuetao/linux
 S:     Maintained
 T:     git git://github.com/gxt/linux.git
@@ -11336,12 +11495,6 @@ F:     include/sound/pxa2xx-lib.h
 F:     sound/arm/pxa*
 F:     sound/soc/pxa/
 
-PXA3xx NAND FLASH DRIVER
-M:     Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
-L:     linux-mtd@lists.infradead.org
-S:     Maintained
-F:     drivers/mtd/nand/pxa3xx_nand.c
-
 QAT DRIVER
 M:     Giovanni Cabiddu <giovanni.cabiddu@intel.com>
 L:     qat-linux@intel.com
@@ -11361,6 +11514,7 @@ M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:     qemu-devel@nongnu.org
 S:     Maintained
 F:     drivers/firmware/qemu_fw_cfg.c
+F:     include/uapi/linux/qemu_fw_cfg.h
 
 QIB DRIVER
 M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
@@ -11454,8 +11608,9 @@ M:      Stuart Yoder <stuyoder@gmail.com>
 M:     Laurentiu Tudor <laurentiu.tudor@nxp.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/fsl-mc/
+F:     drivers/bus/fsl-mc/
 F:     Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
+F:     Documentation/networking/dpaa2/overview.rst
 
 QT1010 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
@@ -11628,7 +11783,7 @@ F:      drivers/char/random.c
 
 RAPIDIO SUBSYSTEM
 M:     Matt Porter <mporter@kernel.crashing.org>
-M:     Alexandre Bounine <alexandre.bounine@idt.com>
+M:     Alexandre Bounine <alex.bou9@gmail.com>
 S:     Maintained
 F:     drivers/rapidio/
 
@@ -11702,7 +11857,7 @@ X:      kernel/torture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:     Alessandro Zummo <a.zummo@towertech.it>
-M:     Alexandre Belloni <alexandre.belloni@free-electrons.com>
+M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
 L:     linux-rtc@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/rtc-linux/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
@@ -11766,6 +11921,11 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git c
 S:     Supported
 F:     drivers/clk/renesas/
 
+RENESAS EMEV2 I2C DRIVER
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/busses/i2c-emev2.c
+
 RENESAS ETHERNET DRIVERS
 R:     Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
 L:     netdev@vger.kernel.org
@@ -11781,6 +11941,12 @@ L:     linux-iio@vger.kernel.org
 S:     Supported
 F:     drivers/iio/adc/rcar_gyro_adc.c
 
+RENESAS R-CAR I2C DRIVERS
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/busses/i2c-rcar.c
+F:     drivers/i2c/busses/i2c-sh_mobile.c
+
 RENESAS USB PHY DRIVER
 M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 L:     linux-renesas-soc@vger.kernel.org
@@ -11824,8 +11990,8 @@ F:      drivers/memstick/host/r592.*
 RICOH SMARTMEDIA/XD DRIVER
 M:     Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
-F:     drivers/mtd/nand/r852.c
-F:     drivers/mtd/nand/r852.h
+F:     drivers/mtd/nand/raw/r852.c
+F:     drivers/mtd/nand/raw/r852.h
 
 RISC-V ARCHITECTURE
 M:     Palmer Dabbelt <palmer@sifive.com>
@@ -11984,16 +12150,16 @@ F:    Documentation/s390/
 F:     Documentation/driver-api/s390-drivers.rst
 
 S390 COMMON I/O LAYER
-M:     Sebastian Ott <sebott@linux.vnet.ibm.com>
-M:     Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+M:     Sebastian Ott <sebott@linux.ibm.com>
+M:     Peter Oberparleiter <oberpar@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/s390/cio/
 
 S390 DASD DRIVER
-M:     Stefan Haberland <sth@linux.vnet.ibm.com>
-M:     Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
+M:     Stefan Haberland <sth@linux.ibm.com>
+M:     Jan Hoeppner <hoeppner@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12008,8 +12174,8 @@ S:      Supported
 F:     drivers/iommu/s390-iommu.c
 
 S390 IUCV NETWORK LAYER
-M:     Julian Wiedmann <jwi@linux.vnet.ibm.com>
-M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:     Julian Wiedmann <jwi@linux.ibm.com>
+M:     Ursula Braun <ubraun@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12018,15 +12184,15 @@ F:    include/net/iucv/
 F:     net/iucv/
 
 S390 NETWORK DRIVERS
-M:     Julian Wiedmann <jwi@linux.vnet.ibm.com>
-M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:     Julian Wiedmann <jwi@linux.ibm.com>
+M:     Ursula Braun <ubraun@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/s390/net/
 
 S390 PCI SUBSYSTEM
-M:     Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:     Sebastian Ott <sebott@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@de.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -12036,8 +12202,8 @@ F:      drivers/pci/hotplug/s390_pci_hpc.c
 
 S390 VFIO-CCW DRIVER
 M:     Cornelia Huck <cohuck@redhat.com>
-M:     Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
-M:     Halil Pasic <pasic@linux.vnet.ibm.com>
+M:     Dong Jia Shi <bjsdjshi@linux.ibm.com>
+M:     Halil Pasic <pasic@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     kvm@vger.kernel.org
 S:     Supported
@@ -12053,8 +12219,8 @@ S:      Supported
 F:     drivers/s390/crypto/
 
 S390 ZFCP DRIVER
-M:     Steffen Maier <maier@linux.vnet.ibm.com>
-M:     Benjamin Block <bblock@linux.vnet.ibm.com>
+M:     Steffen Maier <maier@linux.ibm.com>
+M:     Benjamin Block <bblock@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12100,6 +12266,7 @@ M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
 F:     sound/soc/samsung/
+F:     Documentation/devicetree/bindings/sound/samsung*
 
 SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 M:     Krzysztof Kozlowski <krzk@kernel.org>
@@ -12205,7 +12372,7 @@ F:      Documentation/devicetree/bindings/clock/exynos*.txt
 SAMSUNG SPI DRIVERS
 M:     Kukjin Kim <kgene@kernel.org>
 M:     Krzysztof Kozlowski <krzk@kernel.org>
-M:     Andi Shyti <andi.shyti@samsung.com>
+M:     Andi Shyti <andi@etezian.org>
 L:     linux-spi@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:     Maintained
@@ -12259,13 +12426,6 @@ F:     include/linux/sched.h
 F:     include/uapi/linux/sched.h
 F:     include/linux/wait.h
 
-SCORE ARCHITECTURE
-M:     Chen Liqin <liqin.linux@gmail.com>
-M:     Lennox Wu <lennox.wu@gmail.com>
-W:     http://www.sunplus.com
-S:     Supported
-F:     arch/score/
-
 SCR24X CHIP CARD INTERFACE DRIVER
 M:     Lubomir Rintel <lkundrak@v3.sk>
 S:     Supported
@@ -12496,7 +12656,7 @@ S:      Maintained
 F:     drivers/misc/sgi-xp/
 
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
-M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:     Ursula Braun <ubraun@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12793,14 +12953,20 @@ S:    Maintained
 F:     drivers/net/ethernet/smsc/smsc9420.*
 
 SOC-CAMERA V4L2 SUBSYSTEM
-M:     Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
-S:     Maintained
+S:     Orphan
 F:     include/media/soc*
 F:     drivers/media/i2c/soc_camera/
 F:     drivers/media/platform/soc_camera/
 
+SOCIONEXT SYNQUACER I2C DRIVER
+M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/i2c/busses/i2c-synquacer.c
+F:     Documentation/devicetree/bindings/i2c/i2c-synquacer.txt
+
 SOCIONEXT UNIPHIER SOUND DRIVER
 M:     Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -12859,6 +13025,19 @@ S:     Maintained
 F:     drivers/net/ethernet/socionext/netsec.c
 F:     Documentation/devicetree/bindings/net/socionext-netsec.txt
 
+SOLIDRUN CLEARFOG SUPPORT
+M:     Russell King <linux@armlinux.org.uk>
+S:     Maintained
+F:     arch/arm/boot/dts/armada-388-clearfog*
+F:     arch/arm/boot/dts/armada-38x-solidrun-*
+
+SOLIDRUN CUBOX-I/HUMMINGBOARD SUPPORT
+M:     Russell King <linux@armlinux.org.uk>
+S:     Maintained
+F:     arch/arm/boot/dts/imx6*-cubox-i*
+F:     arch/arm/boot/dts/imx6*-hummingboard*
+F:     arch/arm/boot/dts/imx6*-sr-*
+
 SONIC NETWORK DRIVER
 M:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 L:     netdev@vger.kernel.org
@@ -13015,7 +13194,6 @@ F:      arch/arm/boot/dts/spear*
 F:     arch/arm/mach-spear/
 
 SPI NOR SUBSYSTEM
-M:     Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
 M:     Marek Vasut <marek.vasut@gmail.com>
 L:     linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
@@ -13394,15 +13572,16 @@ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 S:     Supported
 F:     drivers/mfd/syscon.c
 
-SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
+SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
 M:     Sudeep Holla <sudeep.holla@arm.com>
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/arm/arm,scpi.txt
-F:     drivers/clk/clk-scpi.c
-F:     drivers/cpufreq/scpi-cpufreq.c
+F:     Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
+F:     drivers/clk/clk-sc[mp]i.c
+F:     drivers/cpufreq/sc[mp]i-cpufreq.c
 F:     drivers/firmware/arm_scpi.c
-F:     include/linux/scpi_protocol.h
+F:     drivers/firmware/arm_scmi/
+F:     include/linux/sc[mp]i_protocol.h
 
 SYSTEM RESET/SHUTDOWN DRIVERS
 M:     Sebastian Reichel <sre@kernel.org>
@@ -13518,6 +13697,14 @@ T:     git git://linuxtv.org/mkrufky/tuners.git
 S:     Maintained
 F:     drivers/media/tuners/tda18271*
 
+TDA1997x MEDIA DRIVER
+M:     Tim Harvey <tharvey@gateworks.com>
+L:     linux-media@vger.kernel.org
+W:     https://linuxtv.org
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/i2c/tda1997x.*
+
 TDA827x MEDIA DRIVER
 M:     Michael Krufky <mkrufky@linuxtv.org>
 L:     linux-media@vger.kernel.org
@@ -13599,6 +13786,12 @@ L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/rc/ttusbir.c
 
+TECHWELL TW9910 VIDEO DECODER
+L:     linux-media@vger.kernel.org
+S:     Orphan
+F:     drivers/media/i2c/tw9910.c
+F:     include/media/i2c/tw9910.h
+
 TEE SUBSYSTEM
 M:     Jens Wiklander <jens.wiklander@linaro.org>
 S:     Maintained
@@ -13634,7 +13827,8 @@ S:      Supported
 F:     drivers/i2c/busses/i2c-tegra.c
 
 TEGRA IOMMU DRIVERS
-M:     Hiroshi Doyu <hdoyu@nvidia.com>
+M:     Thierry Reding <thierry.reding@gmail.com>
+L:     linux-tegra@vger.kernel.org
 S:     Supported
 F:     drivers/iommu/tegra*
 
@@ -13922,19 +14116,6 @@ S:     Orphan
 F:     drivers/net/wireless/ti/
 F:     include/linux/wl12xx.h
 
-TILE ARCHITECTURE
-W:     http://www.mellanox.com/repository/solutions/tile-scm/
-S:     Orphan
-F:     arch/tile/
-F:     drivers/char/tile-srom.c
-F:     drivers/edac/tile_edac.c
-F:     drivers/net/ethernet/tile/
-F:     drivers/rtc/rtc-tile.c
-F:     drivers/tty/hvc/hvc_tile.c
-F:     drivers/tty/serial/tilegx.c
-F:     drivers/usb/host/*-tilegx.c
-F:     include/linux/usb/tilegx.h
-
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:     John Stultz <john.stultz@linaro.org>
 M:     Thomas Gleixner <tglx@linutronix.de>
@@ -14260,7 +14441,7 @@ F:      include/linux/uwb.h
 F:     include/linux/uwb/
 
 UNICORE32 ARCHITECTURE:
-M:     Guan Xuetao <gxt@mprc.pku.edu.cn>
+M:     Guan Xuetao <gxt@pku.edu.cn>
 W:     http://mprc.pku.edu.cn/~guanxuetao/linux
 S:     Maintained
 T:     git git://github.com/gxt/linux.git
@@ -14399,6 +14580,12 @@ S:     Maintained
 F:     Documentation/hid/hiddev.txt
 F:     drivers/hid/usbhid/
 
+USB INTEL XHCI ROLE MUX DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/roles/intel-xhci-usb-role-switch.c
+
 USB ISP116X DRIVER
 M:     Olav Kongas <ok@artecdesign.ee>
 L:     linux-usb@vger.kernel.org
@@ -14529,6 +14716,12 @@ F:     drivers/usb/
 F:     include/linux/usb.h
 F:     include/linux/usb/
 
+USB TYPEC PI3USB30532 MUX DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/typec/mux/pi3usb30532.c
+
 USB TYPEC SUBSYSTEM
 M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
 L:     linux-usb@vger.kernel.org
@@ -14650,7 +14843,7 @@ VF610 NAND DRIVER
 M:     Stefan Agner <stefan@agner.ch>
 L:     linux-mtd@lists.infradead.org
 S:     Supported
-F:     drivers/mtd/nand/vf610_nfc.c
+F:     drivers/mtd/nand/raw/vf610_nfc.c
 
 VFAT/FAT/MSDOS FILESYSTEM
 M:     OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
@@ -14678,7 +14871,7 @@ F:      include/linux/mdev.h
 F:     samples/vfio-mdev/
 
 VFIO PLATFORM DRIVER
-M:     Baptiste Reynal <b.reynal@virtualopensystems.com>
+M:     Eric Auger <eric.auger@redhat.com>
 L:     kvm@vger.kernel.org
 S:     Maintained
 F:     drivers/vfio/platform/
@@ -14798,7 +14991,7 @@ F:      include/uapi/linux/virtio_crypto.h
 
 VIRTIO DRIVERS FOR S390
 M:     Cornelia Huck <cohuck@redhat.com>
-M:     Halil Pasic <pasic@linux.vnet.ibm.com>
+M:     Halil Pasic <pasic@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     virtualization@lists.linux-foundation.org
 L:     kvm@vger.kernel.org
@@ -14913,7 +15106,7 @@ F:      drivers/input/mouse/vmmouse.c
 F:     drivers/input/mouse/vmmouse.h
 
 VMWARE VMXNET3 ETHERNET DRIVER
-M:     Shrikrishna Khare <skhare@vmware.com>
+M:     Ronak Doshi <doshir@vmware.com>
 M:     "VMware, Inc." <pv-drivers@vmware.com>
 L:     netdev@vger.kernel.org
 S:     Maintained