]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/blobdiff - MAINTAINERS
Merge branches 'pm-domains', 'pm-docs' and 'pm-devfreq'
[mirror_ubuntu-artful-kernel.git] / MAINTAINERS
index 8fb6156c46569047129db203dfc17f84ca57df3a..1a857698ac80502d71392173bf80d8714fe2ccf2 100644 (file)
@@ -35,13 +35,13 @@ trivial patch so apply some common sense.
 
        PLEASE check your patch with the automated style checker
        (scripts/checkpatch.pl) to catch trivial style violations.
-       See Documentation/CodingStyle for guidance here.
+       See Documentation/process/coding-style.rst for guidance here.
 
        PLEASE CC: the maintainers and mailing lists that are generated
        by scripts/get_maintainer.pl.  The results returned by the
        script will be best if you have git installed and are making
        your changes in a branch derived from Linus' latest git tree.
-       See Documentation/SubmittingPatches for details.
+       See Documentation/process/submitting-patches.rst for details.
 
        PLEASE try to include any credit lines you want added with the
        patch. It avoids people being missed off by mistake and makes
@@ -54,7 +54,7 @@ trivial patch so apply some common sense.
        of the Linux Foundation certificate of contribution and should
        include a Signed-off-by: line.  The current version of this
        "Developer's Certificate of Origin" (DCO) is listed in the file
-       Documentation/SubmittingPatches.
+       Documentation/process/submitting-patches.rst.
 
 6.     Make sure you have the right to send any changes you make. If you
        do changes at work you may find your employer owns the patch
@@ -74,9 +74,14 @@ Descriptions of section entries:
           These reviewers should be CCed on patches.
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
+       B: URI for where to file bugs. A web-page with detailed bug
+          filing info, a direct bug tracker link, or a mailto: URI.
+       C: URI for chat protocol, server and channel where developers
+          usually hang out, for example irc://server/channel.
        Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.
           Type is one of: git, hg, quilt, stgit, topgit
+       B: Bug tracking system location.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
@@ -138,7 +143,7 @@ S:  Maintained
 F:     drivers/net/ethernet/3com/typhoon*
 
 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
-M:     Adam Radford <linuxraid@lsi.com>
+M:     Adam Radford <aradford@gmail.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.lsi.com
 S:     Supported
@@ -255,6 +260,12 @@ L: linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-104-idio-16.c
 
+ACCES 104-QUAD-8 IIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/counter/104-quad-8.c
+
 ACENIC DRIVER
 M:     Jes Sorensen <jes@trained-monkey.org>
 L:     linux-acenic@sunsite.dk
@@ -281,6 +292,7 @@ L:  linux-acpi@vger.kernel.org
 W:     https://01.org/linux-acpi
 Q:     https://patchwork.kernel.org/project/linux-acpi/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     drivers/acpi/
 F:     drivers/pnp/pnpacpi/
@@ -304,6 +316,8 @@ W:  https://acpica.org/
 W:     https://github.com/acpica/acpica/
 Q:     https://patchwork.kernel.org/project/linux-acpi/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+B:     https://bugzilla.kernel.org
+B:     https://bugs.acpica.org
 S:     Supported
 F:     drivers/acpi/acpica/
 F:     include/acpi/
@@ -313,6 +327,7 @@ ACPI FAN DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
 W:     https://01.org/linux-acpi
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     drivers/acpi/fan.c
 
@@ -328,6 +343,7 @@ ACPI THERMAL DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
 W:     https://01.org/linux-acpi
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     drivers/acpi/*thermal*
 
@@ -335,6 +351,7 @@ ACPI VIDEO DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
 W:     https://01.org/linux-acpi
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     drivers/acpi/acpi_video.c
 
@@ -523,6 +540,7 @@ S:  Supported
 F:     fs/afs/
 F:     include/net/af_rxrpc.h
 F:     net/rxrpc/af_rxrpc.c
+W:     https://www.infradead.org/~dhowells/kafs/
 
 AGPGART DRIVER
 M:     David Airlie <airlied@linux.ie>
@@ -570,6 +588,11 @@ T: git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/usb/airspy/
 
+ALACRITECH GIGABIT ETHERNET DRIVER
+M:     Lino Sanfilippo <LinoSanfilippo@gmx.de>
+S:     Maintained
+F:     drivers/net/ethernet/alacritech/*
+
 ALCATEL SPEEDTOUCH USB DRIVER
 M:     Duncan Sands <duncan.sands@free.fr>
 L:     linux-usb@vger.kernel.org
@@ -787,7 +810,7 @@ S:  Supported
 F:     drivers/iio/*/ad*
 X:     drivers/iio/*/adjd*
 F:     drivers/staging/iio/*/ad*
-F:     staging/iio/trigger/iio-trig-bfin-timer.c
+F:     drivers/staging/iio/trigger/iio-trig-bfin-timer.c
 
 ANALOG DEVICES INC DMA DRIVERS
 M:     Lars-Peter Clausen <lars@metafoo.de>
@@ -1019,6 +1042,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 N:     sun[x456789]i
 F:     arch/arm/boot/dts/ntc-gr8*
+F:     arch/arm64/boot/dts/allwinner/
 
 ARM/Allwinner SoC Clock Support
 M:     Emilio López <emilio@elopez.com.ar>
@@ -1036,6 +1060,7 @@ F:        arch/arm/mach-meson/
 F:     arch/arm/boot/dts/meson*
 F:     arch/arm64/boot/dts/amlogic/
 F:     drivers/pinctrl/meson/
+F:     drivers/mmc/host/meson*
 N:     meson
 
 ARM/Annapurna Labs ALPINE ARCHITECTURE
@@ -1479,8 +1504,9 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-oxnas/
-F:     arch/arm/boot/dts/oxnas*
+F:     arch/arm/boot/dts/ox8*.dtsi
 F:     arch/arm/boot/dts/wd-mbwe.dts
+F:     arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
 N:     oxnas
 
 ARM/Mediatek RTC DRIVER
@@ -1601,6 +1627,7 @@ F:        arch/arm/mach-qcom/
 F:     arch/arm64/boot/dts/qcom/*
 F:     drivers/i2c/busses/i2c-qup.c
 F:     drivers/clk/qcom/
+F:     drivers/pinctrl/qcom/
 F:     drivers/soc/qcom/
 F:     drivers/spi/spi-qup.c
 F:     drivers/tty/serial/msm_serial.h
@@ -1720,7 +1747,7 @@ F:        drivers/staging/media/platform/s5p-cec/
 
 ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
 M:     Andrzej Pietrasiewicz <andrzej.p@samsung.com>
-M:     Jacek Anaszewski <j.anaszewski@samsung.com>
+M:     Jacek Anaszewski <jacek.anaszewski@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -1775,16 +1802,16 @@ F:      drivers/char/hw_random/st-rng.c
 F:     drivers/clocksource/arm_global_timer.c
 F:     drivers/clocksource/clksrc_st_lpc.c
 F:     drivers/cpufreq/sti-cpufreq.c
+F:     drivers/dma/st_fdma*
 F:     drivers/i2c/busses/i2c-st.c
 F:     drivers/media/rc/st_rc.c
 F:     drivers/media/platform/sti/c8sectpfe/
 F:     drivers/mmc/host/sdhci-st.c
 F:     drivers/phy/phy-miphy28lp.c
-F:     drivers/phy/phy-miphy365x.c
 F:     drivers/phy/phy-stih407-usb.c
-F:     drivers/phy/phy-stih41x-usb.c
 F:     drivers/pinctrl/pinctrl-st.c
 F:     drivers/remoteproc/st_remoteproc.c
+F:     drivers/remoteproc/st_slim_rproc.c
 F:     drivers/reset/sti/
 F:     drivers/rtc/rtc-st-lpc.c
 F:     drivers/tty/serial/st-asc.c
@@ -1793,6 +1820,7 @@ F:        drivers/usb/host/ehci-st.c
 F:     drivers/usb/host/ohci-st.c
 F:     drivers/watchdog/st_lpc_wdt.c
 F:     drivers/ata/ahci_st.c
+F:     include/linux/remoteproc/st_slim_rproc.h
 
 ARM/STM32 ARCHITECTURE
 M:     Maxime Coquelin <mcoquelin.stm32@gmail.com>
@@ -2318,6 +2346,13 @@ F:       include/uapi/linux/ax25.h
 F:     include/net/ax25.h
 F:     net/ax25/
 
+AXENTIA ASOC DRIVERS
+M:     Peter Rosin <peda@axentia.se>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/axentia,*
+F:     sound/soc/atmel/tse850-pcm5142.c
+
 AZ6007 DVB DRIVER
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -2530,6 +2565,8 @@ L:        netdev@vger.kernel.org
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     kernel/bpf/
+F:     tools/testing/selftests/bpf/
+F:     lib/test_bpf.c
 
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Michael Chan <michael.chan@broadcom.com>
@@ -2590,6 +2627,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
 S:     Maintained
 N:     bcm2835
+F:     drivers/staging/vc04_services
 
 BROADCOM BCM47XX MIPS ARCHITECTURE
 M:     Hauke Mehrtens <hauke@hauke-m.de>
@@ -2742,6 +2780,14 @@ L:       bcm-kernel-feedback-list@broadcom.com
 S:     Maintained
 F:     drivers/mtd/nand/brcmnand/
 
+BROADCOM STB AVS CPUFREQ DRIVER
+M:     Markus Mayer <mmayer@broadcom.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
+F:     drivers/cpufreq/brcmstb*
+
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 M:     Rafał Miłecki <zajec5@gmail.com>
 L:     linux-wireless@vger.kernel.org
@@ -2756,7 +2802,7 @@ S:        Supported
 F:     drivers/net/ethernet/broadcom/bcmsysport.*
 
 BROADCOM VULCAN ARM64 SOC
-M:     Jayachandran C. <jchandra@broadcom.com>
+M:     Jayachandran C. <c.jayachandran@gmail.com>
 M:     bcm-kernel-feedback-list@broadcom.com
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -2930,7 +2976,7 @@ CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVER
 M:     Kevin Tsai <ktsai@capellamicro.com>
 S:     Maintained
 F:     drivers/iio/light/cm*
-F:     Documentation/devicetree/bindings/i2c/trivial-devices.txt
+F:     Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst
 
 CAVIUM I2C DRIVER
 M:     Jan Glauber <jglauber@cavium.com>
@@ -2964,15 +3010,15 @@ L:      linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://linuxtv.org
 S:     Supported
-F:     Documentation/cec.txt
+F:     Documentation/media/kapi/cec-core.rst
 F:     Documentation/media/uapi/cec
-F:     drivers/staging/media/cec/
+F:     drivers/media/cec/
 F:     drivers/media/cec-edid.c
 F:     drivers/media/rc/keymaps/rc-cec.c
 F:     include/media/cec.h
 F:     include/media/cec-edid.h
-F:     include/linux/cec.h
-F:     include/linux/cec-funcs.h
+F:     include/uapi/linux/cec.h
+F:     include/uapi/linux/cec-funcs.h
 
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -3030,6 +3076,12 @@ F:       drivers/usb/host/whci/
 F:     drivers/usb/wusbcore/
 F:     include/linux/usb/wusb*
 
+HT16K33 LED CONTROLLER DRIVER
+M:     Robin van der Gracht <robin@protonic.nl>
+S:     Maintained
+F:     drivers/auxdisplay/ht16k33.c
+F:     Documentation/devicetree/bindings/display/ht16k33.txt
+
 CFAG12864B LCD DRIVER
 M:     Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 W:     http://miguelojeda.es/auxdisplay.htm
@@ -3078,7 +3130,7 @@ M:        Harry Wei <harryxiyou@gmail.com>
 L:     xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)
 L:     linux-kernel@zh-kernel.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/zh_CN/
+F:     Documentation/translations/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 M:     Peter Chen <Peter.Chen@nxp.com>
@@ -3149,15 +3201,15 @@ S:      Supported
 F:     drivers/clocksource
 
 CISCO FCOE HBA DRIVER
-M:     Hiral Patel <hiralpat@cisco.com>
-M:     Suma Ramars <sramars@cisco.com>
-M:     Brian Uchino <buchino@cisco.com>
+M:     Satish Kharat <satishkh@cisco.com>
+M:     Sesidhar Baddela <sebaddel@cisco.com>
+M:     Karan Tilak Kumar <kartilak@cisco.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/fnic/
 
 CISCO SCSI HBA DRIVER
-M:     Narsimhulu Musini <nmusini@cisco.com>
+M:     Karan Tilak Kumar <kartilak@cisco.com>
 M:     Sesidhar Baddela <sebaddel@cisco.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
@@ -3334,6 +3386,7 @@ L:        linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 T:     git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
+B:     https://bugzilla.kernel.org
 F:     Documentation/cpu-freq/
 F:     drivers/cpufreq/
 F:     include/linux/cpufreq.h
@@ -3373,6 +3426,7 @@ M:        Daniel Lezcano <daniel.lezcano@linaro.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+B:     https://bugzilla.kernel.org
 F:     drivers/cpuidle/*
 F:     include/linux/cpuidle.h
 
@@ -3418,6 +3472,7 @@ F:        arch/*/crypto/
 F:     crypto/
 F:     drivers/crypto/
 F:     include/crypto/
+F:     include/linux/crypto*
 
 CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
 M:     Neil Horman <nhorman@tuxdriver.com>
@@ -3912,7 +3967,7 @@ F:        include/linux/dma-buf*
 F:     include/linux/reservation.h
 F:     include/linux/*fence.h
 F:     Documentation/dma-buf-sharing.txt
-T:     git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 SYNC FILE FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
@@ -3920,10 +3975,12 @@ R:      Gustavo Padovan <gustavo@padovan.org>
 S:     Maintained
 L:     linux-media@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
-F:     drivers/dma-buf/sync_file.c
+F:     drivers/dma-buf/sync_*
+F:     drivers/dma-buf/sw_sync.c
 F:     include/linux/sync_file.h
+F:     include/uapi/linux/sync_file.h
 F:     Documentation/sync_file.txt
-T:     git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:     Vinod Koul <vinod.koul@intel.com>
@@ -4011,6 +4068,8 @@ DRM DRIVERS
 M:     David Airlie <airlied@linux.ie>
 L:     dri-devel@lists.freedesktop.org
 T:     git git://people.freedesktop.org/~airlied/linux
+B:     https://bugs.freedesktop.org/
+C:     irc://chat.freenode.net/dri-devel
 S:     Maintained
 F:     drivers/gpu/drm/
 F:     drivers/gpu/vga/
@@ -4021,11 +4080,30 @@ F:      Documentation/gpu/
 F:     include/drm/
 F:     include/uapi/drm/
 
+DRM DRIVERS AND MISC GPU PATCHES
+M:     Daniel Vetter <daniel.vetter@intel.com>
+M:     Jani Nikula <jani.nikula@linux.intel.com>
+M:     Sean Paul <seanpaul@chromium.org>
+W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/gpu/
+F:     drivers/gpu/vga/
+F:     drivers/gpu/drm/*
+F:     include/drm/drm*
+F:     include/uapi/drm/drm*
+
 DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 M:     Dave Airlie <airlied@redhat.com>
 S:     Odd Fixes
 F:     drivers/gpu/drm/ast/
 
+DRM DRIVERS FOR BRIDGE CHIPS
+M:     Archit Taneja <architt@codeaurora.org>
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/bridge/
+
 DRM DRIVER FOR BOCHS VIRTUAL GPU
 M:     Gerd Hoffmann <kraxel@redhat.com>
 S:     Odd Fixes
@@ -4061,8 +4139,9 @@ INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 M:     Daniel Vetter <daniel.vetter@intel.com>
 M:     Jani Nikula <jani.nikula@linux.intel.com>
 L:     intel-gfx@lists.freedesktop.org
-L:     dri-devel@lists.freedesktop.org
 W:     https://01.org/linuxgraphics/
+B:     https://01.org/linuxgraphics/documentation/how-report-bugs
+C:     irc://chat.freenode.net/intel-gfx
 Q:     http://patchwork.freedesktop.org/project/intel-gfx/
 T:     git git://anongit.freedesktop.org/drm-intel
 S:     Supported
@@ -4071,6 +4150,16 @@ F:       include/drm/i915*
 F:     include/uapi/drm/i915_drm.h
 F:     Documentation/gpu/i915.rst
 
+INTEL GVT-g DRIVERS (Intel GPU Virtualization)
+M:      Zhenyu Wang <zhenyuw@linux.intel.com>
+M:      Zhi Wang <zhi.a.wang@intel.com>
+L:      igvt-g-dev@lists.01.org
+L:      intel-gfx@lists.freedesktop.org
+W:      https://01.org/igvt-g
+T:      git https://github.com/01org/gvt-linux.git
+S:      Supported
+F:      drivers/gpu/drm/i915/gvt/
+
 DRM DRIVERS FOR ATMEL HLCDC
 M:     Boris Brezillon <boris.brezillon@free-electrons.com>
 L:     dri-devel@lists.freedesktop.org
@@ -4085,6 +4174,15 @@ S:       Supported
 F:     drivers/gpu/drm/sun4i/
 F:     Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
 
+DRM DRIVERS FOR AMLOGIC SOCS
+M:     Neil Armstrong <narmstrong@baylibre.com>
+L:     dri-devel@lists.freedesktop.org
+L:     linux-amlogic@lists.infradead.org
+W:     http://linux-meson.com/
+S:     Supported
+F:     drivers/gpu/drm/meson/
+F:     Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
+
 DRM DRIVERS FOR EXYNOS
 M:     Inki Dae <inki.dae@samsung.com>
 M:     Joonyoung Shim <jy0922.shim@samsung.com>
@@ -4124,6 +4222,7 @@ F:        drivers/gpu/drm/gma500/
 
 DRM DRIVERS FOR HISILICON
 M:     Xinliang Liu <z.liuxinliang@hisilicon.com>
+M:     Rongrong Zou <zourongrong@gmail.com>
 R:     Xinwei Kong <kong.kongxinwei@hisilicon.com>
 R:     Chen Feng <puck.chen@hisilicon.com>
 L:     dri-devel@lists.freedesktop.org
@@ -4248,6 +4347,7 @@ DRM DRIVERS FOR VIVANTE GPU IP
 M:     Lucas Stach <l.stach@pengutronix.de>
 R:     Russell King <linux+etnaviv@armlinux.org.uk>
 R:     Christian Gmeiner <christian.gmeiner@gmail.com>
+L:     etnaviv@lists.freedesktop.org
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/etnaviv/
@@ -4288,6 +4388,13 @@ S:       Maintained
 F:     drivers/gpu/drm/tilcdc/
 F:     Documentation/devicetree/bindings/display/tilcdc/
 
+DRM DRIVERS FOR ZTE ZX
+M:     Shawn Guo <shawnguo@kernel.org>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+F:     drivers/gpu/drm/zte/
+F:     Documentation/devicetree/bindings/display/zte,vou.txt
+
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -4482,7 +4589,8 @@ L:        linux-edac@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
 S:     Supported
-F:     Documentation/edac.txt
+F:     Documentation/admin-guide/ras.rst
+F:     Documentation/driver-api/edac.rst
 F:     drivers/edac/
 F:     include/linux/edac.h
 
@@ -4632,12 +4740,14 @@ L:      linux-efi@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 S:     Maintained
 F:     Documentation/efi-stub.txt
-F:     arch/ia64/kernel/efi.c
+F:     arch/*/kernel/efi.c
 F:     arch/x86/boot/compressed/eboot.[ch]
-F:     arch/x86/include/asm/efi.h
+F:     arch/*/include/asm/efi.h
 F:     arch/x86/platform/efi/
 F:     drivers/firmware/efi/
 F:     include/linux/efi*.h
+F:     arch/arm/boot/compressed/efi-header.S
+F:     arch/arm64/kernel/efi-entry.S
 
 EFI VARIABLE FILESYSTEM
 M:     Matthew Garrett <matthew.garrett@nebula.com>
@@ -4689,11 +4799,11 @@ M:      David Woodhouse <dwmw2@infradead.org>
 L:     linux-embedded@vger.kernel.org
 S:     Maintained
 
-EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER
-M:     James Smart <james.smart@avagotech.com>
-M:     Dick Kennedy <dick.kennedy@avagotech.com>
+EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
+M:     James Smart <james.smart@broadcom.com>
+M:     Dick Kennedy <dick.kennedy@broadcom.com>
 L:     linux-scsi@vger.kernel.org
-W:     http://www.avagotech.com
+W:     http://www.broadcom.com
 S:     Supported
 F:     drivers/scsi/lpfc/
 
@@ -4951,7 +5061,9 @@ K:        fmc_d.*register
 FPGA MANAGER FRAMEWORK
 M:     Alan Tull <atull@opensource.altera.com>
 R:     Moritz Fischer <moritz.fischer@ettus.com>
+L:     linux-fpga@vger.kernel.org
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
 F:     drivers/fpga/
 F:     include/linux/fpga/fpga-mgr.h
 W:     http://www.rocketboards.org
@@ -4969,10 +5081,9 @@ F:       drivers/net/wan/dlci.c
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
 L:     linux-fbdev@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
-S:     Maintained
+S:     Orphan
 F:     Documentation/fb/
 F:     drivers/video/
 F:     include/video/
@@ -4980,6 +5091,14 @@ F:       include/linux/fb.h
 F:     include/uapi/video/
 F:     include/uapi/linux/fb.h
 
+FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
+M:     Horia Geantă <horia.geanta@nxp.com>
+M:     Dan Douglass <dan.douglass@nxp.com>
+L:     linux-crypto@vger.kernel.org
+S:     Maintained
+F:     drivers/crypto/caam/
+F:     Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+
 FREESCALE DIU FRAMEBUFFER DRIVER
 M:     Timur Tabi <timur@tabi.org>
 L:     linux-fbdev@vger.kernel.org
@@ -5045,9 +5164,24 @@ S:       Maintained
 F:     drivers/net/ethernet/freescale/fman
 F:     Documentation/devicetree/bindings/powerpc/fsl/fman.txt
 
+FREESCALE QORIQ DPAA ETHERNET DRIVER
+M:     Madalin Bucur <madalin.bucur@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/freescale/dpaa
+
+FREESCALE SOC DRIVERS
+M:     Scott Wood <oss@buserror.net>
+L:     linuxppc-dev@lists.ozlabs.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     drivers/soc/fsl/
+F:     include/linux/fsl/
+
 FREESCALE QUICC ENGINE LIBRARY
+M:     Qiang Zhao <qiang.zhao@nxp.com>
 L:     linuxppc-dev@lists.ozlabs.org
-S:     Orphan
+S:     Maintained
 F:     drivers/soc/fsl/qe/
 F:     include/soc/fsl/*qe*.h
 F:     include/soc/fsl/*ucc*.h
@@ -5099,13 +5233,6 @@ F:       sound/soc/fsl/fsl*
 F:     sound/soc/fsl/imx*
 F:     sound/soc/fsl/mpc8610_hpcd.c
 
-FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
-M:     "J. German Rivera" <German.Rivera@freescale.com>
-M:     Stuart Yoder <stuart.yoder@nxp.com>
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-F:     drivers/staging/fsl-mc/
-
 FREEVXFS FILESYSTEM
 M:     Christoph Hellwig <hch@infradead.org>
 W:     ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@ -5139,6 +5266,7 @@ F:        include/linux/fscache*.h
 FS-CRYPTO: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
 M:     Theodore Y. Ts'o <tytso@mit.edu>
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
+L:     linux-fsdevel@vger.kernel.org
 S:     Supported
 F:     fs/crypto/
 F:     include/linux/fscrypto.h
@@ -5203,6 +5331,7 @@ L:        kernel-hardening@lists.openwall.com
 S:     Maintained
 F:     scripts/gcc-plugins/
 F:     scripts/gcc-plugin.sh
+F:     scripts/Makefile.gcc-plugins
 F:     Documentation/gcc-plugins.txt
 
 GCOV BASED KERNEL PROFILING
@@ -5607,14 +5736,13 @@ S:      Maintained
 F:     drivers/media/dvb-frontends/hd29l2*
 
 HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
-M:     Brian Boylston <brian.boylston@hpe.com>
+M:     Jimmy Vance <jimmy.vance@hpe.com>
 S:     Supported
 F:     Documentation/watchdog/hpwdt.txt
 F:     drivers/watchdog/hpwdt.c
 
 HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 M:     Don Brace <don.brace@microsemi.com>
-L:     iss_storagedev@hp.com
 L:     esc.storagedev@microsemi.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
@@ -5625,7 +5753,6 @@ F:        include/uapi/linux/cciss*.h
 
 HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 M:     Don Brace <don.brace@microsemi.com>
-L:     iss_storagedev@hp.com
 L:     esc.storagedev@microsemi.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
@@ -5664,6 +5791,7 @@ HIBERNATION (aka Software Suspend, aka swsusp)
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Pavel Machek <pavel@ucw.cz>
 L:     linux-pm@vger.kernel.org
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     arch/x86/power/
 F:     drivers/base/power/
@@ -5845,6 +5973,7 @@ F:        drivers/input/serio/hyperv-keyboard.c
 F:     drivers/pci/host/pci-hyperv.c
 F:     drivers/net/hyperv/
 F:     drivers/scsi/storvsc_drv.c
+F:     drivers/uio/uio_hv_generic.c
 F:     drivers/video/fbdev/hyperv_fb.c
 F:     include/linux/hyperv.h
 F:     tools/hv/
@@ -6088,14 +6217,9 @@ S:       Maintained
 F:     Documentation/cdrom/ide-cd
 F:     drivers/ide/ide-cd*
 
-IDLE-I7300
-M:     Andy Henroid <andrew.d.henroid@intel.com>
-L:     linux-pm@vger.kernel.org
-S:     Supported
-F:     drivers/idle/i7300_idle.c
-
 IEEE 802.15.4 SUBSYSTEM
 M:     Alexander Aring <aar@pengutronix.de>
+M:     Stefan Schmidt <stefan@osg.samsung.com>
 L:     linux-wpan@vger.kernel.org
 W:     http://wpan.cakelab.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
@@ -6125,6 +6249,22 @@ L:       linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/rc/iguanair.c
 
+IIO DIGITAL POTENTIOMETER DAC
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac
+F:     Documentation/devicetree/bindings/iio/dac/dpot-dac.txt
+F:     drivers/iio/dac/dpot-dac.c
+
+IIO ENVELOPE DETECTOR
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
+F:     Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
+F:     drivers/iio/adc/envelope-detector.c
+
 IIO SUBSYSTEM AND DRIVERS
 M:     Jonathan Cameron <jic23@kernel.org>
 R:     Hartmut Knaack <knaack.h@gmx.de>
@@ -6282,9 +6422,11 @@ S:       Maintained
 F:     drivers/platform/x86/intel-vbtn.c
 
 INTEL IDLE DRIVER
+M:     Jacob Pan <jacob.jun.pan@linux.intel.com>
 M:     Len Brown <lenb@kernel.org>
 L:     linux-pm@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     drivers/idle/intel_idle.c
 
@@ -6382,10 +6524,7 @@ F:       drivers/net/ethernet/intel/*/
 
 INTEL RDMA RNIC DRIVER
 M:     Faisal Latif <faisal.latif@intel.com>
-R:     Chien Tin Tung <chien.tin.tung@intel.com>
-R:     Mustafa Ismail <mustafa.ismail@intel.com>
-R:     Shiraz Saleem <shiraz.saleem@intel.com>
-R:     Tatyana Nikolova <tatyana.e.nikolova@intel.com>
+M:     Shiraz Saleem <shiraz.saleem@intel.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/hw/i40iw/
@@ -6504,6 +6643,13 @@ S:       Maintained
 F:     arch/x86/include/asm/pmc_core.h
 F:     drivers/platform/x86/intel_pmc_core*
 
+INVENSENSE MPU-3050 GYROSCOPE DRIVER
+M:     Linus Walleij <linus.walleij@linaro.org>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/gyro/mpu3050*
+F:     Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt
+
 IOC3 ETHERNET DRIVER
 M:     Ralf Baechle <ralf@linux-mips.org>
 L:     linux-mips@linux-mips.org
@@ -7084,7 +7230,7 @@ F:        drivers/scsi/53c700*
 
 LED SUBSYSTEM
 M:     Richard Purdie <rpurdie@rpsys.net>
-M:     Jacek Anaszewski <j.anaszewski@samsung.com>
+M:     Jacek Anaszewski <jacek.anaszewski@gmail.com>
 M:     Pavel Machek <pavel@ucw.cz>
 L:     linux-leds@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
@@ -7425,14 +7571,6 @@ S:       Maintained
 F:     Documentation/ldm.txt
 F:     block/partitions/ldm.*
 
-LogFS
-M:     Joern Engel <joern@logfs.org>
-M:     Prasad Joshi <prasadjoshi.linux@gmail.com>
-L:     logfs@logfs.org
-W:     logfs.org
-S:     Maintained
-F:     fs/logfs/
-
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 M:     Sathya Prakash <sathya.prakash@broadcom.com>
 M:     Chaitra P B <chaitra.basappa@broadcom.com>
@@ -7558,8 +7696,10 @@ S:       Maintained
 MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
 M:     Andrew Lunn <andrew@lunn.ch>
 M:     Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/dsa/mv88e6xxx/
+F:     Documentation/devicetree/bindings/net/dsa/marvell.txt
 
 MARVELL ARMADA DRM SUPPORT
 M:     Russell King <rmk+kernel@armlinux.org.uk>
@@ -7709,6 +7849,7 @@ MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
 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/mcp4531.c
 
 MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
@@ -7727,6 +7868,15 @@ F:       Documentation/devicetree/bindings/media/renesas,fcp.txt
 F:     drivers/media/platform/rcar-fcp.c
 F:     include/media/rcar-fcp.h
 
+MEDIA DRIVERS FOR RENESAS - FDP1
+M:     Kieran Bingham <kieran@bingham.xyz>
+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,fdp1.txt
+F:     drivers/media/platform/rcar_fdp1.c
+
 MEDIA DRIVERS FOR RENESAS - VIN
 M:     Niklas Söderlund <niklas.soderlund@ragnatech.se>
 L:     linux-media@vger.kernel.org
@@ -7833,6 +7983,24 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/mediatek/
 
+MEDIATEK MEDIA DRIVER
+M:     Tiffany Lin <tiffany.lin@mediatek.com>
+M:     Andrew-CT Chen <andrew-ct.chen@mediatek.com>
+S:     Supported
+F:     drivers/media/platform/mtk-vcodec/
+F:     drivers/media/platform/mtk-vpu/
+F:     Documentation/devicetree/bindings/media/mediatek-vcodec.txt
+F:     Documentation/devicetree/bindings/media/mediatek-vpu.txt
+
+MEDIATEK MDP DRIVER
+M:     Minghsiu Tsai <minghsiu.tsai@mediatek.com>
+M:     Houlong Wei <houlong.wei@mediatek.com>
+M:     Andrew-CT Chen <andrew-ct.chen@mediatek.com>
+S:     Supported
+F:     drivers/media/platform/mtk-mdp/
+F:     drivers/media/platform/mtk-vpu/
+F:     Documentation/devicetree/bindings/media/mediatek-mdp.txt
+
 MEDIATEK MT7601U WIRELESS LAN DRIVER
 M:     Jakub Kicinski <kubakici@wp.pl>
 L:     linux-wireless@vger.kernel.org
@@ -7840,12 +8008,12 @@ S:      Maintained
 F:     drivers/net/wireless/mediatek/mt7601u/
 
 MEGARAID SCSI/SAS DRIVERS
-M:     Kashyap Desai <kashyap.desai@avagotech.com>
-M:     Sumit Saxena <sumit.saxena@avagotech.com>
-M:     Uday Lingala <uday.lingala@avagotech.com>
-L:     megaraidlinux.pdl@avagotech.com
+M:     Kashyap Desai <kashyap.desai@broadcom.com>
+M:     Sumit Saxena <sumit.saxena@broadcom.com>
+M:     Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
+L:     megaraidlinux.pdl@broadcom.com
 L:     linux-scsi@vger.kernel.org
-W:     http://www.lsi.com
+W:     http://www.avagotech.com/support/
 S:     Maintained
 F:     Documentation/scsi/megaraid.txt
 F:     drivers/scsi/megaraid.*
@@ -7883,6 +8051,15 @@ W:       http://www.mellanox.com
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
 F:     drivers/net/ethernet/mellanox/mlxsw/
 
+MELLANOX MLXCPLD I2C AND MUX DRIVER
+M:     Vadim Pasternak <vadimp@mellanox.com>
+M:     Michael Shych <michaelsh@mellanox.com>
+L:     linux-i2c@vger.kernel.org
+S:     Supported
+F:     drivers/i2c/busses/i2c-mlxcpld.c
+F:     drivers/i2c/muxes/i2c-mux-mlxcpld.c
+F:     Documentation/i2c/busses/i2c-mlxcpld
+
 MELLANOX MLXCPLD LED DRIVER
 M:     Vadim Pasternak <vadimp@mellanox.com>
 L:     linux-leds@vger.kernel.org
@@ -7894,7 +8071,14 @@ MELLANOX PLATFORM DRIVER
 M:      Vadim Pasternak <vadimp@mellanox.com>
 L:      platform-driver-x86@vger.kernel.org
 S:      Supported
-F:      arch/x86/platform/mellanox/mlx-platform.c
+F:      drivers/platform/x86/mlx-platform.c
+
+MELLANOX MLX CPLD HOTPLUG DRIVER
+M:     Vadim Pasternak <vadimp@mellanox.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Supported
+F:     drivers/platform/x86/mlxcpld-hotplug.c
+F:     include/linux/platform_data/mlxcpld-hotplug.h
 
 SOFT-ROCE DRIVER (rxe)
 M:     Moni Shoua <monis@mellanox.com>
@@ -8273,6 +8457,12 @@ T:       git git://linuxtv.org/mkrufky/tuners.git
 S:     Maintained
 F:     drivers/media/tuners/mxl5007t.*
 
+MXSFB DRM DRIVER
+M:     Marek Vasut <marex@denx.de>
+S:     Supported
+F:     drivers/gpu/drm/mxsfb/
+F:     Documentation/devicetree/bindings/display/mxsfb-drm.txt
+
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 M:     Hyong-Youb Kim <hykim@myri.com>
 L:     netdev@vger.kernel.org
@@ -8319,7 +8509,6 @@ F:        drivers/scsi/arm/oak.c
 F:     drivers/scsi/atari_scsi.*
 F:     drivers/scsi/dmx3191d.c
 F:     drivers/scsi/g_NCR5380.*
-F:     drivers/scsi/g_NCR5380_mmio.c
 F:     drivers/scsi/mac_scsi.*
 F:     drivers/scsi/sun3_scsi.*
 F:     drivers/scsi/sun3_scsi_vme.c
@@ -8450,7 +8639,6 @@ F:        include/uapi/linux/net_namespace.h
 F:     tools/net/
 F:     tools/testing/selftests/net/
 F:     lib/random32.c
-F:     lib/test_bpf.c
 
 NETWORKING [IPv4/IPv6]
 M:     "David S. Miller" <davem@davemloft.net>
@@ -8641,7 +8829,7 @@ T:        git git://github.com/jonmason/ntb.git
 F:     drivers/ntb/hw/intel/
 
 NTB AMD DRIVER
-M:     Xiangliang Yu <Xiangliang.Yu@amd.com>
+M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     linux-ntb@googlegroups.com
 S:     Supported
 F:     drivers/ntb/hw/amd/
@@ -8679,6 +8867,16 @@ L:       linux-nvme@lists.infradead.org
 S:     Supported
 F:     drivers/nvme/target/
 
+NVM EXPRESS FC TRANSPORT DRIVERS
+M:     James Smart <james.smart@broadcom.com>
+L:     linux-nvme@lists.infradead.org
+S:     Supported
+F:     include/linux/nvme-fc.h
+F:     include/linux/nvme-fc-driver.h
+F:     drivers/nvme/host/fc.c
+F:     drivers/nvme/target/fc.c
+F:     drivers/nvme/target/fcloop.c
+
 NVMEM FRAMEWORK
 M:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 M:     Maxime Ripard <maxime.ripard@free-electrons.com>
@@ -8741,6 +8939,7 @@ F:        drivers/regulator/tps65217-regulator.c
 F:     drivers/regulator/tps65218-regulator.c
 F:     drivers/regulator/tps65910-regulator.c
 F:     drivers/regulator/twl-regulator.c
+F:     drivers/regulator/twl6030-regulator.c
 F:     include/linux/i2c-omap.h
 
 OMAP DEVICE TREE SUPPORT
@@ -8961,9 +9160,11 @@ F:       drivers/of/resolver.c
 
 OPENRISC ARCHITECTURE
 M:     Jonas Bonn <jonas@southpole.se>
-W:     http://openrisc.net
+M:     Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
+M:     Stafford Horne <shorne@gmail.com>
+L:     openrisc@lists.librecores.org
+W:     http://openrisc.io
 S:     Maintained
-T:     git git://openrisc.net/~jonas/linux
 F:     arch/openrisc/
 
 OPENVSWITCH
@@ -9095,7 +9296,7 @@ F:      drivers/misc/panel.c
 
 PARALLEL PORT SUBSYSTEM
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-M:     Sudip Mukherjee <sudip@vectorindia.org>
+M:     Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 L:     linux-parport@lists.infradead.org (subscribers-only)
 S:     Maintained
 F:     drivers/parport/
@@ -9250,11 +9451,12 @@ S:      Maintained
 F:     drivers/pci/host/*layerscape*
 
 PCI DRIVER FOR IMX6
-M:     Richard Zhu <Richard.Zhu@freescale.com>
+M:     Richard Zhu <hongxing.zhu@nxp.com>
 M:     Lucas Stach <l.stach@pengutronix.de>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
 F:     drivers/pci/host/*imx6*
 
 PCI DRIVER FOR TI KEYSTONE
@@ -9313,17 +9515,11 @@ F:      drivers/pci/host/pci-exynos.c
 
 PCI DRIVER FOR SYNOPSIS DESIGNWARE
 M:     Jingoo Han <jingoohan1@gmail.com>
-M:     Pratyush Anand <pratyush.anand@gmail.com>
-L:     linux-pci@vger.kernel.org
-S:     Maintained
-F:     drivers/pci/host/*designware*
-
-PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
-M:     Jose Abreu <Jose.Abreu@synopsys.com>
+M:     Joao Pinto <Joao.Pinto@synopsys.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/pci/designware-pcie.txt
-F:     drivers/pci/host/pcie-designware-plat.c
+F:     drivers/pci/host/*designware*
 
 PCI DRIVER FOR GENERIC OF HOSTS
 M:     Will Deacon <will.deacon@arm.com>
@@ -9571,8 +9767,8 @@ F:      arch/mips/boot/dts/pistachio/
 F:      arch/mips/configs/pistachio*_defconfig
 
 PKTCDVD DRIVER
-M:     Jiri Kosina <jikos@kernel.org>
-S:     Maintained
+S:     Orphan
+M:     linux-block@vger.kernel.org
 F:     drivers/block/pktcdvd.c
 F:     include/linux/pktcdvd.h
 F:     include/uapi/linux/pktcdvd.h
@@ -9625,6 +9821,7 @@ POWER MANAGEMENT CORE
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:     linux-pm@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     drivers/base/power/
 F:     include/linux/pm.h
@@ -9785,7 +9982,7 @@ M:        Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     drivers/staging/media/pulse8-cec
+F:     drivers/media/usb/pulse8-cec/*
 
 PVRUSB2 VIDEO4LINUX DRIVER
 M:     Mike Isely <isely@pobox.com>
@@ -9806,7 +10003,7 @@ F:       drivers/media/usb/pwc/*
 
 PWM FAN DRIVER
 M:     Kamil Debski <kamil@wypas.org>
-M:     Lukasz Majewski <l.majewski@samsung.com>
+M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:     linux-hwmon@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@ -9940,6 +10137,12 @@ F:      drivers/net/ethernet/qlogic/qed/
 F:     include/linux/qed/
 F:     drivers/net/ethernet/qlogic/qede/
 
+QLOGIC QL41xxx ISCSI DRIVER
+M:     QLogic-Storage-Upstream@cavium.com
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/qedi/
+
 QNX4 FILESYSTEM
 M:     Anders Larsen <al@alarsen.net>
 W:     http://www.alarsen.net/linux/qnx4fs/
@@ -9948,6 +10151,12 @@ F:      fs/qnx4/
 F:     include/uapi/linux/qnx4_fs.h
 F:     include/uapi/linux/qnxtypes.h
 
+QORIQ DPAA2 FSL-MC BUS DRIVER
+M:     Stuart Yoder <stuart.yoder@nxp.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/fsl-mc/
+
 QT1010 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -10125,6 +10334,14 @@ L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/sw/rdmavt
 
+RDT - RESOURCE ALLOCATION
+M:     Fenghua Yu <fenghua.yu@intel.com>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     arch/x86/kernel/cpu/intel_rdt*
+F:     arch/x86/include/asm/intel_rdt*
+F:     Documentation/x86/intel_rdt*
+
 READ-COPY UPDATE (RCU)
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
@@ -10410,7 +10627,7 @@ F:      arch/s390/pci/
 F:     drivers/pci/hotplug/s390_pci_hpc.c
 
 S390 ZCRYPT DRIVER
-M:     Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
+M:     Harald Freudenberger <freude@de.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -10577,7 +10794,7 @@ L:      netdev@vger.kernel.org
 F:     drivers/net/ethernet/samsung/sxgbe/
 
 SAMSUNG THERMAL DRIVER
-M:     Lukasz Majewski <l.majewski@samsung.com>
+M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:     linux-pm@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Supported
@@ -10605,6 +10822,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/serial/
 F:     drivers/tty/serial/
 
+SERIAL IR RECEIVER
+M:     Sean Young <sean@mess.org>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/rc/serial_ir.c
+
 STI CEC DRIVER
 M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
 L:     kernel@stlinux.com
@@ -10703,6 +10926,11 @@ W:     http://www.sunplus.com
 S:     Supported
 F:     arch/score/
 
+SCR24X CHIP CARD INTERFACE DRIVER
+M:     Lubomir Rintel <lkundrak@v3.sk>
+S:     Supported
+F:     drivers/char/pcmcia/scr24x_cs.c
+
 SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
 M:     Sudeep Holla <sudeep.holla@arm.com>
 L:     linux-arm-kernel@lists.infradead.org
@@ -10911,7 +11139,6 @@ F:      drivers/net/ethernet/emulex/benet/
 EMULEX ONECONNECT ROCE DRIVER
 M:     Selvin Xavier <selvin.xavier@avagotech.com>
 M:     Devesh Sharma <devesh.sharma@avagotech.com>
-M:     Mitesh Ahuja <mitesh.ahuja@avagotech.com>
 L:     linux-rdma@vger.kernel.org
 W:     http://www.emulex.com
 S:     Supported
@@ -11106,7 +11333,7 @@ F:      include/media/i2c/ov2659.h
 SILICON MOTION SM712 FRAME BUFFER DRIVER
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 M:     Teddy Wang <teddy.wang@siliconmotion.com>
-M:     Sudip Mukherjee <sudip@vectorindia.org>
+M:     Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/video/fbdev/sm712*
@@ -11468,7 +11695,7 @@ STABLE BRANCH
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     stable@vger.kernel.org
 S:     Supported
-F:     Documentation/stable_kernel_rules.txt
+F:     Documentation/process/stable-kernel-rules.rst
 
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -11534,17 +11761,11 @@ F:    drivers/staging/rtl8712/
 STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 M:     Teddy Wang <teddy.wang@siliconmotion.com>
-M:     Sudip Mukherjee <sudip@vectorindia.org>
+M:     Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/sm750fb/
 
-STAGING - SLICOSS
-M:     Lior Dotan <liodot@gmail.com>
-M:     Christopher Harrer <charrer@alacritech.com>
-S:     Odd Fixes
-F:     drivers/staging/slicoss/
-
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:     William Hubbs <w.d.hubbs@gmail.com>
 M:     Chris Brannon <chris@the-brannons.com>
@@ -11614,6 +11835,7 @@ M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Len Brown <len.brown@intel.com>
 M:     Pavel Machek <pavel@ucw.cz>
 L:     linux-pm@vger.kernel.org
+B:     https://bugzilla.kernel.org
 S:     Supported
 F:     Documentation/power/
 F:     arch/x86/kernel/acpi/
@@ -11653,6 +11875,7 @@ S:      Supported
 F:     arch/arc/
 F:     Documentation/devicetree/bindings/arc/*
 F:     Documentation/devicetree/bindings/interrupt-controller/snps,arc*
+F:     drivers/clocksource/arc_timer.c
 F:     drivers/tty/serial/arc_uart.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
 
@@ -11913,6 +12136,16 @@ S:     Maintained
 F:     arch/xtensa/
 F:     drivers/irqchip/irq-xtensa-*
 
+Texas Instruments' System Control Interface (TISCI) Protocol Driver
+M:     Nishanth Menon <nm@ti.com>
+M:     Tero Kristo <t-kristo@ti.com>
+M:     Santosh Shilimkar <ssantosh@kernel.org>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
+F:     drivers/firmware/ti_sci*
+F:     include/linux/soc/ti/ti_sci_protocol.h
+
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
@@ -12343,6 +12576,12 @@ S:     Maintained
 F:     Documentation/filesystems/udf.txt
 F:     fs/udf/
 
+UDRAW TABLET
+M:     Bastien Nocera <hadess@hadess.net>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-udraw.c
+
 UFS FILESYSTEM
 M:     Evgeniy Dushistov <dushistov@mail.ru>
 S:     Maintained
@@ -12399,7 +12638,8 @@ F:      Documentation/scsi/ufs.txt
 F:     drivers/scsi/ufs/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
-M:     Joao Pinto <Joao.Pinto@synopsys.com>
+M:     Manjunath M Bettegowda <manjumb@synopsys.com>
+M:     Prabu Thangamuthu <prabut@synopsys.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ufs/*dwc*
@@ -12757,6 +12997,15 @@ F:     drivers/vfio/
 F:     include/linux/vfio.h
 F:     include/uapi/linux/vfio.h
 
+VFIO MEDIATED DEVICE DRIVERS
+M:     Kirti Wankhede <kwankhede@nvidia.com>
+L:     kvm@vger.kernel.org
+S:     Maintained
+F:     Documentation/vfio-mediated-device.txt
+F:     drivers/vfio/mdev/
+F:     include/linux/mdev.h
+F:     samples/vfio-mdev/
+
 VFIO PLATFORM DRIVER
 M:     Baptiste Reynal <b.reynal@virtualopensystems.com>
 L:     kvm@vger.kernel.org
@@ -12811,6 +13060,7 @@ F:      drivers/net/virtio_net.c
 F:     drivers/block/virtio_blk.c
 F:     include/linux/virtio_*.h
 F:     include/uapi/linux/virtio_*.h
+F:     drivers/crypto/virtio/
 
 VIRTIO DRIVERS FOR S390
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
@@ -12847,6 +13097,14 @@ S:     Maintained
 F:     drivers/virtio/virtio_input.c
 F:     include/uapi/linux/virtio_input.h
 
+VIRTIO CRYPTO DRIVER
+M:  Gonglei <arei.gonglei@huawei.com>
+L:  virtualization@lists.linux-foundation.org
+L:  linux-crypto@vger.kernel.org
+S:  Maintained
+F:  drivers/crypto/virtio/
+F:  include/uapi/linux/virtio_crypto.h
+
 VIA RHINE NETWORK DRIVER
 S:     Orphan
 F:     drivers/net/ethernet/via/via-rhine.c
@@ -12909,7 +13167,7 @@ M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     devel@driverdev.osuosl.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
-F:     Documentation/vme_api.txt
+F:     Documentation/driver-api/vme.rst
 F:     drivers/staging/vme/
 F:     drivers/vme/
 F:     include/linux/vme*
@@ -12951,6 +13209,13 @@ S:     Maintained
 F:     drivers/scsi/vmw_pvscsi.c
 F:     drivers/scsi/vmw_pvscsi.h
 
+VMWARE PVRDMA DRIVER
+M:     Adit Ranadive <aditr@vmware.com>
+M:     VMware PV-Drivers <pv-drivers@vmware.com>
+L:     linux-rdma@vger.kernel.org
+S:     Maintained
+F:     drivers/infiniband/hw/vmw_pvrdma/
+
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 M:     Liam Girdwood <lgirdwood@gmail.com>
 M:     Mark Brown <broonie@kernel.org>
@@ -13133,7 +13398,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
 S:     Maintained
 F:     include/linux/workqueue.h
 F:     kernel/workqueue.c
-F:     Documentation/workqueue.txt
+F:     Documentation/core-api/workqueue.rst
 
 X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
 M:     Chen-Yu Tsai <wens@csie.org>
@@ -13198,7 +13463,6 @@ F:      drivers/media/tuners/tuner-xc2028.*
 
 XEN HYPERVISOR INTERFACE
 M:     Boris Ostrovsky <boris.ostrovsky@oracle.com>
-M:     David Vrabel <david.vrabel@citrix.com>
 M:     Juergen Gross <jgross@suse.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git