Merge branch 'asoc-4.17' into asoc-4.18 merge window
authorMark Brown <broonie@kernel.org>
Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)
1  2 
MAINTAINERS
sound/soc/intel/boards/bytcr_rt5651.c

diff --combined MAINTAINERS
index eaee45919cb9bdb93d4f29dca70f7909cae54dc7,fc29793c2f67d2f0049ef323ce32ed19e521d60d..1eed0f5edd8630792186374a1e681fc7857ef613
@@@ -766,8 -766,6 +766,8 @@@ F: drivers/gpu/drm/amd/amdgpu/amdgpu_am
  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
@@@ -861,17 -859,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>
@@@ -934,8 -922,8 +934,8 @@@ F: drivers/char/apm-emulation.
  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
@@@ -1065,42 -1053,41 +1065,42 @@@ ARM POR
  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
  
@@@ -1158,7 -1145,7 +1158,7 @@@ S:      Maintaine
  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
@@@ -1232,21 -1219,37 +1232,21 @@@ F:   Documentation/devicetree/bindings/i2
  
  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@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/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1567,6 -1570,15 +1567,6 @@@ ARM/MAGICIAN MACHINE SUPPOR
  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>
@@@ -1637,27 -1649,6 +1637,27 @@@ L:    linux-arm-kernel@lists.infradead.or
  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)
@@@ -1702,20 -1693,6 +1702,20 @@@ F:    Documentation/devicetree/bindings/ar
  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)
@@@ -1726,7 -1703,7 +1726,7 @@@ F:      drivers/input/keyboard/w90p910_keypa
  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
@@@ -1748,7 -1725,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*
@@@ -1879,6 -1856,7 +1879,6 @@@ Q:      https://patchwork.kernel.org/project
  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/
@@@ -1978,14 -1956,6 +1978,14 @@@ M:    Thor Thayer <thor.thayer@linux.intel
  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)
@@@ -2028,15 -1998,6 +2028,15 @@@ 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>
@@@ -2426,6 -2387,7 +2426,6 @@@ T:      git git://github.com/ndyer/linux.gi
  S:    Maintained
  F:    Documentation/devicetree/bindings/input/atmel,maxtouch.txt
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
 -F:    include/linux/platform_data/atmel_mxt_ts.h
  
  ATMEL SAMA5D2 ADC DRIVER
  M:    Ludovic Desroches <ludovic.desroches@microchip.com>
@@@ -2508,6 -2470,7 +2508,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
@@@ -2659,6 -2622,51 +2659,6 @@@ F:     Documentation/filesystems/bfs.tx
  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
@@@ -2670,7 -2678,6 +2670,7 @@@ L:      linux-block@vger.kernel.or
  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
  
@@@ -3002,7 -3009,7 +3002,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>
@@@ -3270,11 -3277,12 +3270,11 @@@ F:   drivers/net/ieee802154/cc2520.
  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
@@@ -3292,7 -3300,6 +3292,7 @@@ F:      include/media/cec-notifier.
  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>
@@@ -3735,6 -3742,16 +3735,6 @@@ S:     Maintaine
  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>
@@@ -4094,10 -4111,10 +4094,10 @@@ DENALI NAND DRIVE
  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
@@@ -4311,7 -4328,6 +4311,7 @@@ Q:      https://patchwork.kernel.org/project
  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
@@@ -4389,14 -4405,8 +4389,14 @@@ L:    linux-kernel@vger.kernel.or
  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
@@@ -4441,13 -4451,6 +4441,13 @@@ T:    git git://anongit.freedesktop.org/dr
  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
@@@ -4602,8 -4605,8 +4602,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
@@@ -4616,7 -4619,7 +4616,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/
@@@ -4636,7 -4639,7 +4636,7 @@@ F:      Documentation/gpu/meson.rs
  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/
@@@ -4729,7 -4732,6 +4729,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
@@@ -4996,6 -4998,12 +4996,6 @@@ T:     git git://linuxtv.org/anttip/media_t
  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
@@@ -5537,7 -5545,7 +5537,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)
@@@ -5622,7 -5630,7 +5622,7 @@@ S:      Maintaine
  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*
@@@ -5633,7 -5641,7 +5633,7 @@@ FREESCALE GPMI NAND DRIVE
  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>
@@@ -5784,6 -5792,10 +5784,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
@@@ -5831,6 -5843,12 +5831,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>
@@@ -5842,7 -5860,7 +5842,7 @@@ F:      scripts/Makefile.gcc-plugin
  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
@@@ -5910,11 -5928,6 +5910,11 @@@ S:    Supporte
  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>
@@@ -5996,7 -6009,7 +5996,7 @@@ S:      Maintaine
  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
@@@ -6009,14 -6022,12 +6009,14 @@@ L:   linux-gpio@vger.kernel.or
  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/
@@@ -6226,11 -6237,6 +6226,11 @@@ F:    Documentation/hw_random.tx
  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>
@@@ -6375,13 -6381,6 +6375,13 @@@ W:    http://www.hisilicon.co
  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>
@@@ -6419,7 -6418,6 +6419,7 @@@ L:      linux-mm@kvack.or
  S:    Maintained
  F:    mm/hmm*
  F:    include/linux/hmm*
 +F:    Documentation/vm/hmm.txt
  
  HOST AP DRIVER
  M:    Jouni Malinen <j@w1.fi>
@@@ -6526,7 -6524,7 +6526,7 @@@ S:      Maintaine
  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
@@@ -6569,7 -6567,7 +6569,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
@@@ -6590,25 -6588,15 +6590,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
@@@ -6908,13 -6896,6 +6908,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
@@@ -6969,7 -6950,7 +6969,7 @@@ INGENIC JZ4780 NAND DRIVE
  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>
@@@ -7004,7 -6985,7 +7004,7 @@@ F:      drivers/input/input-mt.
  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
@@@ -7023,14 -7004,13 +7023,13 @@@ L:   linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/i810/
  
- INTEL ASoC BDW/HSW DRIVERS
+ INTEL ASoC DRIVERS
+ M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+ M:    Liam Girdwood <liam.r.girdwood@linux.intel.com>
  M:    Jie Yang <yang.jie@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
- F:    sound/soc/intel/common/sst-dsp*
- F:    sound/soc/intel/common/sst-firmware.c
- F:    sound/soc/intel/boards/broadwell.c
- F:    sound/soc/intel/haswell/
+ F:    sound/soc/intel/
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
@@@ -7075,7 -7055,6 +7074,7 @@@ F:      Documentation/networking/ixgbe.tx
  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
@@@ -7241,15 -7220,6 +7240,15 @@@ M:    Shiraz Saleem <shiraz.saleem@intel.c
  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>
@@@ -7345,7 -7315,6 +7344,7 @@@ S:      Maintaine
  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
@@@ -7364,7 -7333,7 +7363,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
@@@ -7546,13 -7515,6 +7545,13 @@@ Q:    http://patchwork.linuxtv.org/project
  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
@@@ -7782,7 -7744,7 +7781,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
@@@ -7939,10 -7901,7 +7938,10 @@@ 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
@@@ -8068,14 -8027,6 +8067,14 @@@ Q:    https://patchwork.kernel.org/project
  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
@@@ -8190,25 -8141,7 +8189,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>
@@@ -8371,6 -8304,11 +8370,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
@@@ -8469,7 -8407,7 +8468,7 @@@ F:      include/uapi/drm/armada_drm.
  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
@@@ -8488,7 -8426,7 +8487,7 @@@ S:      Orpha
  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
@@@ -8501,7 -8439,7 +8500,7 @@@ F:      drivers/net/ethernet/marvell/mv643xx
  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
@@@ -8528,10 -8466,10 +8527,10 @@@ S:   Odd Fixe
  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
@@@ -8643,23 -8581,13 +8642,23 @@@ W:   https://linuxtv.or
  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
@@@ -8676,14 -8604,6 +8675,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  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>
@@@ -8694,15 -8614,6 +8693,15 @@@ T:    git git://linuxtv.org/media_tree.gi
  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
@@@ -8770,16 -8681,6 +8769,16 @@@ T:    git git://linuxtv.org/media_tree.gi
  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
@@@ -8879,15 -8780,6 +8878,15 @@@ M:    Sean Wang <sean.wang@mediatek.com
  S:    Maintained
  F:    drivers/media/rc/mtk-cir.c
  
 +MEDIATEK DMA DRIVER
 +M:    Sean Wang <sean.wang@mediatek.com>
 +L:    dmaengine@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/mtk-*
 +F:    drivers/dma/mediatek/
 +
  MEDIATEK PMIC LED DRIVER
  M:    Sean Wang <sean.wang@mediatek.com>
  S:    Maintained
@@@ -8981,13 -8873,6 +8980,13 @@@ W:    http://www.melexis.co
  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
@@@ -9113,7 -8998,6 +9112,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
@@@ -9145,9 -9029,10 +9144,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/
@@@ -9191,6 -9076,20 +9190,6 @@@ F:     drivers/media/platform/meson/ao-cec.
  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/
@@@ -9232,7 -9131,7 +9231,7 @@@ M:      Wenyou Yang <wenyou.yang@microchip.c
  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
@@@ -9245,13 -9144,6 +9244,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
@@@ -9259,15 -9151,6 +9258,15 @@@ S:    Maintaine
  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
@@@ -9488,14 -9371,6 +9487,14 @@@ S:    Maintaine
  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
@@@ -9573,7 -9448,7 +9572,7 @@@ S:      Supporte
  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/
@@@ -10301,13 -10176,6 +10300,13 @@@ T: git git://linuxtv.org/media_tree.gi
  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
@@@ -10322,13 -10190,6 +10321,13 @@@ T: git git://linuxtv.org/media_tree.gi
  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
@@@ -10337,14 -10198,6 +10336,14 @@@ S: Maintaine
  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
@@@ -10353,21 -10206,11 +10352,21 @@@ S:        Maintaine
  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
@@@ -10564,6 -10407,14 +10563,6 @@@ L:  platform-driver-x86@vger.kernel.or
  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>
@@@ -10864,7 -10715,6 +10863,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/
@@@ -10876,7 -10726,6 +10875,7 @@@ L:   linux-pci@vger.kernel.or
  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/
  
@@@ -11168,7 -11017,7 +11167,7 @@@ F:   include/linux/pktcdvd.
  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
@@@ -11494,6 -11343,12 +11493,6 @@@ F:  include/sound/pxa2xx-lib.
  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
@@@ -11513,7 -11368,6 +11512,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>
@@@ -11607,9 -11461,8 +11606,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>
@@@ -11782,7 -11635,7 +11781,7 @@@ F:   drivers/char/random.
  
  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/
  
@@@ -11856,7 -11709,7 +11855,7 @@@ X:   kernel/torture.
  
  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
@@@ -11920,11 -11773,6 +11919,11 @@@ T: git git://git.kernel.org/pub/scm/lin
  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
@@@ -11940,12 -11788,6 +11939,12 @@@ L: linux-iio@vger.kernel.or
  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
@@@ -11989,8 -11831,8 +11988,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>
@@@ -12149,16 -11991,16 +12148,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
@@@ -12173,8 -12015,8 +12172,8 @@@ S:   Supporte
  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
@@@ -12183,15 -12025,15 +12182,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/
@@@ -12201,8 -12043,8 +12200,8 @@@ F:   drivers/pci/hotplug/s390_pci_hpc.
  
  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
@@@ -12218,8 -12060,8 +12217,8 @@@ S:   Supporte
  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
@@@ -12364,7 -12206,6 +12363,7 @@@ M:   Tomasz Figa <tomasz.figa@gmail.com
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  S:    Supported
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
  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
@@@ -12426,6 -12267,13 +12425,6 @@@ F:  include/linux/sched.
  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
@@@ -12656,7 -12504,7 +12655,7 @@@ S:   Maintaine
  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
@@@ -12953,20 -12801,14 +12952,20 @@@ S:        Maintaine
  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)
@@@ -13025,19 -12867,6 +13024,19 @@@ S: Maintaine
  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
@@@ -13194,6 -13023,7 +13193,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/
@@@ -13523,12 -13353,6 +13522,12 @@@ S: Maintaine
  F:    drivers/gpio/gpio-dwapb.c
  F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
  
 +SYNOPSYS DESIGNWARE AXI DMAC DRIVER
 +M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 +S:    Maintained
 +F:    drivers/dma/dwi-axi-dmac/
 +F:    Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt
 +
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:    Viresh Kumar <vireshk@kernel.org>
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@@ -13572,16 -13396,15 +13571,16 @@@ T:        git git://git.kernel.org/pub/scm/lin
  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>
@@@ -13697,14 -13520,6 +13696,14 @@@ T: git git://linuxtv.org/mkrufky/tuners
  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
@@@ -13786,12 -13601,6 +13785,12 @@@ L: linux-media@vger.kernel.or
  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
@@@ -13827,8 -13636,7 +13826,8 @@@ S:   Supporte
  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*
  
@@@ -14001,13 -13809,6 +14000,13 @@@ F: arch/arm/mach-davinci
  F:    drivers/i2c/busses/i2c-davinci.c
  F:    arch/arm/boot/dts/da850*
  
 +TI DAVINCI SERIES CLOCK DRIVER
 +M:    David Lechner <david@lechnology.com>
 +R:    Sekhar Nori <nsekhar@ti.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/ti/davinci/
 +F:    drivers/clk/davinci/
 +
  TI DAVINCI SERIES GPIO DRIVER
  M:    Keerthy <j-keerthy@ti.com>
  L:    linux-gpio@vger.kernel.org
@@@ -14123,6 -13924,19 +14122,6 @@@ S:  Orpha
  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>
@@@ -14448,7 -14262,7 +14447,7 @@@ F:   include/linux/uwb.
  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
@@@ -14587,12 -14401,6 +14586,12 @@@ S: Maintaine
  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
@@@ -14723,12 -14531,6 +14722,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
@@@ -14850,7 -14652,7 +14849,7 @@@ VF610 NAND DRIVE
  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>
@@@ -14878,7 -14680,7 +14877,7 @@@ F:   include/linux/mdev.
  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/
@@@ -14998,7 -14800,7 +14997,7 @@@ F:   include/uapi/linux/virtio_crypto.
  
  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
@@@ -15113,7 -14915,7 +15112,7 @@@ F:   drivers/input/mouse/vmmouse.
  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
index 1be788e04193ac2bd4129e295dbdc5c82bd80843,bf59c7caf1d970cf5f7a6318bbbbd8399bbae5ff..987720e203f9160717af035bc8d859895fc9fc6f
@@@ -706,7 -706,6 +706,7 @@@ static struct snd_soc_card byt_rt5651_c
  static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN];
  static char byt_rt5651_codec_aif_name[12]; /*  = "rt5651-aif[1|2]" */
  static char byt_rt5651_cpu_dai_name[10]; /*  = "ssp[0|2]-port" */
 +static char byt_rt5651_long_name[40]; /* = "bytcr-rt5651-*-spk-*-mic" */
  
  static bool is_valleyview(void)
  {
@@@ -727,10 -726,6 +727,10 @@@ struct acpi_chan_package {   /* ACPICA 
  
  static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
  {
 +      const char * const intmic_name[] =
 +              { "dmic", "in1", "in2", "in12", "in1", "in2" };
 +      const char * const hsmic_name[] =
 +              {  "in2", "in2", "in1",  "in3", "in3", "in3" };
        struct byt_rt5651_private *priv;
        struct snd_soc_acpi_mach *mach;
        const char *i2c_name = NULL;
        int dai_index = 0;
        int i;
  
 -      priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC);
 +      priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
  
        if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) {
                priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
                if (IS_ERR(priv->mclk)) {
+                       ret_val = PTR_ERR(priv->mclk);
                        dev_err(&pdev->dev,
-                               "Failed to get MCLK from pmc_plt_clk_3: %ld\n",
-                               PTR_ERR(priv->mclk));
+                               "Failed to get MCLK from pmc_plt_clk_3: %d\n",
+                               ret_val);
                        /*
                         * Fall back to bit clock usage for -ENOENT (clock not
                         * available likely due to missing dependencies), bail
                }
        }
  
 +      snprintf(byt_rt5651_long_name, sizeof(byt_rt5651_long_name),
 +               "bytcr-rt5651-%s-intmic-%s-hsmic",
 +               intmic_name[BYT_RT5651_MAP(byt_rt5651_quirk)],
 +               hsmic_name[BYT_RT5651_MAP(byt_rt5651_quirk)]);
 +      byt_rt5651_card.long_name = byt_rt5651_long_name;
 +
        ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5651_card);
  
        if (ret_val) {