Merge tag 'v4.11-rc1' into regulator-arizona

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS

index ef0c801aff45ad0e5b652f652fe46be45b7597a0..c35e0cea7831211536599cddc489382d827900a3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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,10 +74,13 @@ 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.
@@ -139,7 +142,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
@@ -256,6 +259,18 @@ 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
+
+ACCES PCI-IDIO-16 GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-pci-idio-16.c
+
  ACENIC DRIVER
  M:     Jes Sorensen <jes@trained-monkey.org>
  L:     linux-acenic@sunsite.dk
@@ -530,6 +545,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>
@@ -577,6 +593,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
@@ -628,7 +649,7 @@ S:  Maintained
  F:     drivers/gpio/gpio-altera.c
  
  ALTERA SYSTEM RESOURCE DRIVER FOR ARRIA10 DEVKIT
-M:     Thor Thayer <tthayer@opensource.altera.com>
+M:     Thor Thayer <thor.thayer@linux.intel.com>
  S:     Maintained
  F:     drivers/gpio/gpio-altera-a10sr.c
  F:     drivers/mfd/altera-a10sr.c
@@ -794,7 +815,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>
@@ -862,8 +883,8 @@ S:  Odd fixes
  F:     drivers/hwmon/applesmc.c
  
  APPLETALK NETWORK LAYER
-M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
-S:     Maintained
+L:     netdev@vger.kernel.org
+S:     Odd fixes
  F:     drivers/net/appletalk/
  F:     net/appletalk/
  
@@ -961,6 +982,7 @@ 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
+T:     git git://git.armlinux.org.uk/~rmk/linux-arm.git
  F:     arch/arm/
  
  ARM SUB-ARCHITECTURES
@@ -1026,6 +1048,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>
@@ -1043,6 +1066,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
@@ -1073,7 +1097,7 @@ F:        arch/arm/boot/dts/aspeed-*
  F:     drivers/*/*aspeed*
  
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  M:     Alexandre Belloni <alexandre.belloni@free-electrons.com>
  M:     Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1136,6 +1160,7 @@ ARM/CLKDEV SUPPORT
  M:     Russell King <linux@armlinux.org.uk>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:     Maintained
+T:     git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
  F:     arch/arm/include/asm/clkdev.h
  F:     drivers/clk/clkdev.c
  
@@ -1209,13 +1234,9 @@ S:       Maintained
  N:     efm32
  
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
-M:     Daniel Ribeiro <drwyrm@gmail.com>
-M:     Stefan Schmidt <stefan@openezx.org>
-M:     Harald Welte <laforge@openezx.org>
-L:     openezx-devel@lists.openezx.org (moderated for non-subscribers)
-W:     http://www.openezx.org/
+M:     Robert Jarzmik <robert.jarzmik@free.fr>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:     Maintained
-T:     topgit git://git.openezx.org/openezx.git
  F:     arch/arm/mach-pxa/ezx.c
  
  ARM/FARADAY FA526 PORT
@@ -1486,8 +1507,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
@@ -1503,8 +1525,10 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:     Maintained
  F:     arch/arm/boot/dts/mt6*
+F:     arch/arm/boot/dts/mt7*
  F:     arch/arm/boot/dts/mt8*
  F:     arch/arm/mach-mediatek/
+F:     arch/arm64/boot/dts/mediatek/
  N:     mtk
  K:     mediatek
  
@@ -1608,6 +1632,8 @@ 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/dma/qcom/
  F:     drivers/soc/qcom/
  F:     drivers/spi/spi-qup.c
  F:     drivers/tty/serial/msm_serial.h
@@ -1669,6 +1695,7 @@ M:        Krzysztof Kozlowski <krzk@kernel.org>
  R:     Javier Martinez Canillas <javier@osg.samsung.com>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
  S:     Maintained
  F:     arch/arm/boot/dts/s3c*
  F:     arch/arm/boot/dts/s5p*
@@ -1727,7 +1754,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
@@ -1751,7 +1778,7 @@ F:        drivers/soc/renesas/
  F:     include/linux/soc/renesas/
  
  ARM/SOCFPGA ARCHITECTURE
-M:     Dinh Nguyen <dinguyen@opensource.altera.com>
+M:     Dinh Nguyen <dinguyen@kernel.org>
  S:     Maintained
  F:     arch/arm/mach-socfpga/
  F:     arch/arm/boot/dts/socfpga*
@@ -1761,12 +1788,12 @@ W:      http://www.rocketboards.org
  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
  ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
-M:     Dinh Nguyen <dinguyen@opensource.altera.com>
+M:     Dinh Nguyen <dinguyen@kernel.org>
  S:     Maintained
  F:     drivers/clk/socfpga/
  
  ARM/SOCFPGA EDAC SUPPORT
-M:     Thor Thayer <tthayer@opensource.altera.com>
+M:     Thor Thayer <thor.thayer@linux.intel.com>
  S:     Maintained
  F:     drivers/edac/altera_edac.
  
@@ -1782,16 +1809,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
@@ -1800,6 +1827,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>
@@ -1960,12 +1988,18 @@ F:      arch/arm/mach-pxa/include/mach/z2.h
  
  ARM/ZTE ARCHITECTURE
  M:     Jun Nie <jun.nie@linaro.org>
+M:     Baoyou Xie <baoyou.xie@linaro.org>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:     Maintained
  F:     arch/arm/mach-zx/
  F:     drivers/clk/zte/
+F:     drivers/reset/reset-zx2967.c
+F:     drivers/soc/zte/
  F:     Documentation/devicetree/bindings/arm/zte.txt
  F:     Documentation/devicetree/bindings/clock/zx296702-clk.txt
+F:     Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
+F:     Documentation/devicetree/bindings/soc/zte/
+F:     include/dt-bindings/soc/zx*.h
  
  ARM/ZYNQ ARCHITECTURE
  M:     Michal Simek <michal.simek@xilinx.com>
@@ -2152,64 +2186,56 @@ F:      include/linux/atm*
  F:     include/uapi/linux/atm*
  
  ATMEL AT91 / AT32 MCI DRIVER
-M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
  S:     Maintained
  F:     drivers/mmc/host/atmel-mci.c
  
  ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  S:     Supported
  F:     drivers/power/reset/at91-sama5d2_shdwc.c
  
  ATMEL SAMA5D2 ADC DRIVER
-M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
  L:     linux-iio@vger.kernel.org
  S:     Supported
  F:     drivers/iio/adc/at91-sama5d2_adc.c
  
  ATMEL Audio ALSA driver
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:     Supported
  F:     sound/soc/atmel
  
-ATMEL DMA DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Supported
-F:     drivers/dma/at_hdmac.c
-F:     drivers/dma/at_hdmac_regs.h
-F:     include/linux/platform_data/dma-atmel.h
-
  ATMEL XDMA DRIVER
-M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
  L:     linux-arm-kernel@lists.infradead.org
  L:     dmaengine@vger.kernel.org
  S:     Supported
  F:     drivers/dma/at_xdmac.c
  
  ATMEL I2C DRIVER
-M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
  L:     linux-i2c@vger.kernel.org
  S:     Supported
  F:     drivers/i2c/busses/i2c-at91.c
  
  ATMEL ISI DRIVER
-M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
  L:     linux-media@vger.kernel.org
  S:     Supported
  F:     drivers/media/platform/soc_camera/atmel-isi.c
  F:     include/media/atmel-isi.h
  
  ATMEL LCDFB DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  L:     linux-fbdev@vger.kernel.org
  S:     Maintained
  F:     drivers/video/fbdev/atmel_lcdfb.c
  F:     include/video/atmel_lcdc.h
  
  ATMEL MACB ETHERNET DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  S:     Supported
  F:     drivers/net/ethernet/cadence/
  
@@ -2221,32 +2247,32 @@ S:      Supported
  F:     drivers/mtd/nand/atmel_nand*
  
  ATMEL SDMMC DRIVER
-M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
  L:     linux-mmc@vger.kernel.org
  S:     Supported
  F:     drivers/mmc/host/sdhci-of-at91.c
  
  ATMEL SPI DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  S:     Supported
  F:     drivers/spi/spi-atmel.*
  
  ATMEL SSC DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:     Supported
  F:     drivers/misc/atmel-ssc.c
  F:     include/linux/atmel-ssc.h
  
  ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:     Supported
  F:     drivers/misc/atmel_tclib.c
  F:     drivers/clocksource/tcb_clksrc.c
  
  ATMEL USBA UDC DRIVER
-M:     Nicolas Ferre <nicolas.ferre@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@microchip.com>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:     Supported
  F:     drivers/usb/gadget/udc/atmel_usba_udc.*
@@ -2325,6 +2351,21 @@ 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
+
+AXENTIA ARM DEVICES
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/arm/axentia.txt
+F:     arch/arm/boot/dts/at91-linea.dtsi
+F:     arch/arm/boot/dts/at91-tse850-3.dts
+
  AZ6007 DVB DRIVER
  M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
  M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -2358,12 +2399,15 @@ S:      Maintained
  F:     drivers/net/wireless/broadcom/b43legacy/
  
  BACKLIGHT CLASS/SUBSYSTEM
-M:     Jingoo Han <jingoohan1@gmail.com>
  M:     Lee Jones <lee.jones@linaro.org>
+M:     Daniel Thompson <daniel.thompson@linaro.org>
+M:     Jingoo Han <jingoohan1@gmail.com>
  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
  S:     Maintained
  F:     drivers/video/backlight/
  F:     include/linux/backlight.h
+F:     include/linux/pwm_backlight.h
+F:     Documentation/devicetree/bindings/leds/backlight
  
  BATMAN ADVANCED
  M:     Marek Lindner <mareklindner@neomailbox.ch>
@@ -2401,6 +2445,14 @@ W:       https://linuxtv.org
  S:     Supported
  F:     drivers/media/platform/sti/bdisp
  
+DELTA ST MEDIA DRIVER
+M:     Hugues Fruchet <hugues.fruchet@st.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+W:     https://linuxtv.org
+S:     Supported
+F:     drivers/media/platform/sti/delta
+
  BEFS FILE SYSTEM
  M:     Luis de Bethencourt <luisbg@osg.samsung.com>
  M:     Salah Triki <salah.triki@gmail.com>
@@ -2537,6 +2589,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>
@@ -2575,6 +2629,12 @@ L:       netdev@vger.kernel.org
  S:     Supported
  F:     drivers/net/ethernet/broadcom/bnx2x/
  
+BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER
+M:     Michael Chan <michael.chan@broadcom.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/broadcom/bnxt/
+
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:     Florian Fainelli <f.fainelli@gmail.com>
  M:     Ray Jui <rjui@broadcom.com>
@@ -2594,9 +2654,10 @@ M:       Lee Jones <lee@kernel.org>
  M:     Eric Anholt <eric@anholt.net>
  L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
  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
+T:     git git://github.com/anholt/linux
  S:     Maintained
  N:     bcm2835
+F:     drivers/staging/vc04_services
  
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:     Hauke Mehrtens <hauke@hauke-m.de>
@@ -2667,6 +2728,13 @@ F:       drivers/irqchip/irq-brcmstb*
  F:     include/linux/bcm963xx_nvram.h
  F:     include/linux/bcm963xx_tag.h
  
+BROADCOM BMIPS CPUFREQ DRIVER
+M:     Markus Mayer <mmayer@broadcom.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     drivers/cpufreq/bmips-cpufreq.c
+
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:     Siva Reddy Kallam <siva.kallam@broadcom.com>
  M:     Prashant Sreedharan <prashant@broadcom.com>
@@ -2749,6 +2817,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
@@ -2763,12 +2839,23 @@ 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
  F:     arch/arm64/boot/dts/broadcom/vulcan*
  
+BROADCOM NETXTREME-E ROCE DRIVER
+M:     Selvin Xavier <selvin.xavier@broadcom.com>
+M:     Devesh Sharma <devesh.sharma@broadcom.com>
+M:     Somnath Kotur <somnath.kotur@broadcom.com>
+M:     Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
+L:     linux-rdma@vger.kernel.org
+W:     http://www.broadcom.com
+S:     Supported
+F:     drivers/infiniband/hw/bnxt_re/
+F:     include/uapi/rdma/bnxt_re-abi.h
+
  BROCADE BFA FC SCSI DRIVER
  M:     Anil Gurumurthy <anil.gurumurthy@qlogic.com>
  M:     Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
@@ -2937,7 +3024,14 @@ 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 THUNDERX2 ARM64 SOC
+M:     Jayachandran C <jnair@caviumnetworks.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm64/boot/dts/cavium/thunder-99xx*
+F:     Documentation/devicetree/bindings/arm/cavium-thunder2.txt
  
  CAVIUM I2C DRIVER
  M:     Jan Glauber <jglauber@cavium.com>
@@ -2957,6 +3051,13 @@ W:     http://www.cavium.com
  S:     Supported
  F:     drivers/net/ethernet/cavium/liquidio/
  
+CAVIUM OCTEON-TX CRYPTO DRIVER
+M:     George Cherian <george.cherian@cavium.com>
+L:     linux-crypto@vger.kernel.org
+W:     http://www.cavium.com
+S:     Supported
+F:     drivers/crypto/cavium/cpt/
+
  CC2520 IEEE-802.15.4 RADIO DRIVER
  M:     Varka Bhadram <varkabhadram@gmail.com>
  L:     linux-wpan@vger.kernel.org
@@ -2971,15 +3072,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>
@@ -3037,6 +3138,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
@@ -3085,7 +3192,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>
@@ -3156,15 +3263,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
@@ -3341,9 +3448,11 @@ 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
+F:     tools/testing/selftests/cpufreq/
  
  CPU FREQUENCY DRIVERS - ARM BIG LITTLE
  M:     Viresh Kumar <viresh.kumar@linaro.org>
@@ -3380,6 +3489,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
  
@@ -3425,6 +3535,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>
@@ -3525,7 +3636,7 @@ F:        drivers/infiniband/hw/cxgb3/
  F:     include/uapi/rdma/cxgb3-abi.h
  
  CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Hariprasad S <hariprasad@chelsio.com>
+M:     Ganesh Goudar <ganeshgr@chelsio.com>
  L:     netdev@vger.kernel.org
  W:     http://www.chelsio.com
  S:     Supported
@@ -3752,6 +3863,7 @@ F:        include/linux/devcoredump.h
  DEVICE FREQUENCY (DEVFREQ)
  M:     MyungJoo Ham <myungjoo.ham@samsung.com>
  M:     Kyungmin Park <kyungmin.park@samsung.com>
+R:     Chanwoo Choi <cw00.choi@samsung.com>
  L:     linux-pm@vger.kernel.org
  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:     Maintained
@@ -3862,10 +3974,13 @@ S:      Maintained
  F:     drivers/i2c/busses/i2c-diolan-u2c.c
  
  DIRECT ACCESS (DAX)
-M:     Matthew Wilcox <willy@linux.intel.com>
+M:     Matthew Wilcox <mawilcox@microsoft.com>
+M:     Ross Zwisler <ross.zwisler@linux.intel.com>
  L:     linux-fsdevel@vger.kernel.org
  S:     Supported
  F:     fs/dax.c
+F:     include/linux/dax.h
+F:     include/trace/events/fs_dax.h
  
  DIRECTORY NOTIFICATION (DNOTIFY)
  M:     Eric Paris <eparis@parisplace.org>
@@ -3917,8 +4032,8 @@ F:        drivers/dma-buf/
  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
+F:     Documentation/driver-api/dma-buf.rst
+T:     git git://anongit.freedesktop.org/drm/drm-misc
  
  SYNC FILE FRAMEWORK
  M:     Sumit Semwal <sumit.semwal@linaro.org>
@@ -3926,10 +4041,13 @@ 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/dma-fence*
+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>
@@ -4017,6 +4135,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/
@@ -4027,25 +4147,50 @@ 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
+L:     virtualization@lists.linux-foundation.org
+T:     git git://git.kraxel.org/linux drm-qemu
+S:     Maintained
  F:     drivers/gpu/drm/bochs/
  
  DRM DRIVER FOR QEMU'S CIRRUS DEVICE
  M:     Dave Airlie <airlied@redhat.com>
-S:     Odd Fixes
+M:     Gerd Hoffmann <kraxel@redhat.com>
+L:     virtualization@lists.linux-foundation.org
+T:     git git://git.kraxel.org/linux drm-qemu
+S:     Obsolete
+W:     https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
  F:     drivers/gpu/drm/cirrus/
  
  RADEON and AMDGPU DRM DRIVERS
  M:     Alex Deucher <alexander.deucher@amd.com>
  M:     Christian König <christian.koenig@amd.com>
-L:     dri-devel@lists.freedesktop.org
+L:     amd-gfx@lists.freedesktop.org
  T:     git git://people.freedesktop.org/~agd5f/linux
  S:     Supported
  F:     drivers/gpu/drm/radeon/
@@ -4067,8 +4212,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
@@ -4077,6 +4223,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:      intel-gvt-dev@lists.freedesktop.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
@@ -4091,6 +4247,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>
@@ -4130,6 +4295,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
@@ -4151,6 +4317,12 @@ S:       Supported
  F:     drivers/gpu/drm/mediatek/
  F:     Documentation/devicetree/bindings/display/mediatek/
  
+DRM DRIVER FOR MI0283QT
+M:     Noralf Trønnes <noralf@tronnes.org>
+S:     Maintained
+F:     drivers/gpu/drm/tinydrm/mi0283qt.c
+F:     Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
+
  DRM DRIVER FOR MSM ADRENO GPU
  M:     Rob Clark <robdclark@gmail.com>
  L:     linux-arm-msm@vger.kernel.org
@@ -4211,7 +4383,10 @@ F:       Documentation/devicetree/bindings/display/renesas,du.txt
  
  DRM DRIVER FOR QXL VIRTUAL GPU
  M:     Dave Airlie <airlied@redhat.com>
-S:     Odd Fixes
+M:     Gerd Hoffmann <kraxel@redhat.com>
+L:     virtualization@lists.linux-foundation.org
+T:     git git://git.kraxel.org/linux drm-qemu
+S:     Maintained
  F:     drivers/gpu/drm/qxl/
  F:     include/uapi/drm/qxl_drm.h
  
@@ -4254,6 +4429,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/
@@ -4294,6 +4470,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
@@ -4488,7 +4671,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
  
@@ -4638,12 +4822,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>
@@ -4695,11 +4881,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/
  
@@ -4848,7 +5034,6 @@ F:        lib/fault-inject.c
  
  FBTFT Framebuffer drivers
  M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-M:     Noralf Trønnes <noralf@tronnes.org>
  S:     Maintained
  F:     drivers/staging/fbtft/
  
@@ -4957,7 +5142,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
@@ -4975,8 +5162,9 @@ F:        drivers/net/wan/dlci.c
  F:     drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
-M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
+M:     Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:     linux-fbdev@vger.kernel.org
+T:     git git://github.com/bzolnier/linux.git
  Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
  S:     Maintained
  F:     Documentation/fb/
@@ -4986,6 +5174,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
@@ -5051,9 +5247,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
@@ -5105,13 +5316,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
@@ -5145,9 +5349,10 @@ 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
+F:     include/linux/fscrypt*.h
  
  F2FS FILE SYSTEM
  M:     Jaegeuk Kim <jaegeuk@kernel.org>
@@ -5209,6 +5414,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
@@ -5382,6 +5588,7 @@ M:        Alex Elder <elder@kernel.org>
  M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:     Maintained
  F:     drivers/staging/greybus/
+L:     greybus-dev@lists.linaro.org
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:     Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@ -5503,6 +5710,14 @@ T:       git git://linuxtv.org/media_tree.git
  S:     Odd Fixes
  F:     drivers/media/usb/gspca/
  
+GTP (GPRS Tunneling Protocol)
+M:     Pablo Neira Ayuso <pablo@netfilter.org>
+M:     Harald Welte <laforge@gnumonks.org>
+L:     osmocom-net-gprs@lists.osmocom.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git
+S:     Maintained
+F:     drivers/net/gtp.c
+
  GUID PARTITION TABLE (GPT)
  M:     Davidlohr Bueso <dave@stgolabs.net>
  L:     linux-efi@vger.kernel.org
@@ -5602,25 +5817,14 @@ L:      linux-parisc@vger.kernel.org
  S:     Maintained
  F:     sound/parisc/harmony.*
  
-HD29L2 MEDIA DRIVER
-M:     Antti Palosaari <crope@iki.fi>
-L:     linux-media@vger.kernel.org
-W:     https://linuxtv.org
-W:     http://palosaari.fi/linux/
-Q:     http://patchwork.linuxtv.org/project/linux-media/list/
-T:     git git://linuxtv.org/anttip/media_tree.git
-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
@@ -5631,7 +5835,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
@@ -5808,9 +6011,8 @@ F:        include/linux/hsi/
  F:     include/uapi/linux/hsi/
  
  HSO 3G MODEM DRIVER
-M:     Jan Dumon <j.dumon@option.com>
-W:     http://www.pharscape.org
-S:     Maintained
+L:     linux-usb@vger.kernel.org
+S:     Orphan
  F:     drivers/net/usb/hso.c
  
  HSR NETWORK PROTOCOL
@@ -5841,17 +6043,20 @@ F:      drivers/media/platform/sti/hva
  Hyper-V CORE AND DRIVERS
  M:     "K. Y. Srinivasan" <kys@microsoft.com>
  M:     Haiyang Zhang <haiyangz@microsoft.com>
+M:     Stephen Hemminger <sthemmin@microsoft.com>
  L:     devel@linuxdriverproject.org
  S:     Maintained
  F:     arch/x86/include/asm/mshyperv.h
  F:     arch/x86/include/uapi/asm/hyperv.h
  F:     arch/x86/kernel/cpu/mshyperv.c
+F:     arch/x86/hyperv
  F:     drivers/hid/hid-hyperv.c
  F:     drivers/hv/
  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/
@@ -6064,6 +6269,11 @@ S:       Maintained
  F:     drivers/mfd/lpc_ich.c
  F:     drivers/gpio/gpio-ich.c
  
+IDT VersaClock 5 CLOCK DRIVER
+M:     Marek Vasut <marek.vasut@gmail.com>
+S:     Maintained
+F:     drivers/clk/clk-versaclock5.c
+
  IDE SUBSYSTEM
  M:     "David S. Miller" <davem@davemloft.net>
  L:     linux-ide@vger.kernel.org
@@ -6095,14 +6305,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
@@ -6120,6 +6325,13 @@ F:       include/net/cfg802154.h
  F:     include/net/ieee802154_netdev.h
  F:     Documentation/networking/ieee802154.txt
  
+IFE PROTOCOL
+M:     Yotam Gigi <yotamg@mellanox.com>
+M:     Jamal Hadi Salim <jhs@mojatatu.com>
+F:     net/ife
+F:     include/net/ife.h
+F:     include/uapi/linux/ife.h
+
  IGORPLUG-USB IR RECEIVER
  M:     Sean Young <sean@mess.org>
  L:     linux-media@vger.kernel.org
@@ -6132,6 +6344,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>
@@ -6289,9 +6517,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
  
@@ -6389,10 +6619,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/
@@ -6511,6 +6738,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
@@ -6581,9 +6815,8 @@ S:        Odd Fixes
  F:     drivers/tty/ipwireless/
  
  IPX NETWORK LAYER
-M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  L:     netdev@vger.kernel.org
-S:     Maintained
+S:     Odd fixes
  F:     include/net/ipx.h
  F:     include/uapi/linux/ipx.h
  F:     net/ipx/
@@ -7051,6 +7284,7 @@ M:        Masami Hiramatsu <mhiramat@kernel.org>
  S:     Maintained
  F:     Documentation/kprobes.txt
  F:     include/linux/kprobes.h
+F:     include/asm-generic/kprobes.h
  F:     kernel/kprobes.c
  
  KS0108 LCD CONTROLLER DRIVER
@@ -7091,7 +7325,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
@@ -7247,18 +7481,24 @@ L:      linuxppc-dev@lists.ozlabs.org
  Q:     http://patchwork.ozlabs.org/project/linuxppc-dev/list/
  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
  S:     Supported
+F:     Documentation/ABI/stable/sysfs-firmware-opal-*
+F:     Documentation/devicetree/bindings/powerpc/opal/
+F:     Documentation/devicetree/bindings/rtc/rtc-opal.txt
+F:     Documentation/devicetree/bindings/i2c/i2c-opal.txt
  F:     Documentation/powerpc/
  F:     arch/powerpc/
  F:     drivers/char/tpm/tpm_ibmvtpm*
  F:     drivers/crypto/nx/
  F:     drivers/crypto/vmx/
+F:     drivers/i2c/busses/i2c-opal.c
  F:     drivers/net/ethernet/ibm/ibmveth.*
  F:     drivers/net/ethernet/ibm/ibmvnic.*
  F:     drivers/pci/hotplug/pnv_php.c
  F:     drivers/pci/hotplug/rpa*
+F:     drivers/rtc/rtc-opal.c
  F:     drivers/scsi/ibmvscsi/
+F:     drivers/tty/hvc/hvc_opal.c
  F:     tools/testing/selftests/powerpc
-N:     opal
  N:     /pmac
  N:     powermac
  N:     powernv
@@ -7355,8 +7595,8 @@ S:        Maintained
  F:     drivers/misc/lkdtm*
  
  LLC (802.2)
-M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
-S:     Maintained
+L:     netdev@vger.kernel.org
+S:     Odd fixes
  F:     include/linux/llc.h
  F:     include/uapi/linux/llc.h
  F:     include/net/llc*
@@ -7389,6 +7629,7 @@ S:        Maintained
  F:     Documentation/hwmon/lm90
  F:     Documentation/devicetree/bindings/hwmon/lm90.txt
  F:     drivers/hwmon/lm90.c
+F:     include/dt-bindings/thermal/lm90.h
  
  LM95234 HARDWARE MONITOR DRIVER
  M:     Guenter Roeck <linux@roeck-us.net>
@@ -7432,14 +7673,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>
@@ -7562,15 +7795,25 @@ W:      http://www.kernel.org/doc/man-pages
  L:     linux-man@vger.kernel.org
  S:     Maintained
  
+MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
+M:     Rahul Bedarkar <rahul.bedarkar@imgtec.com>
+L:     linux-mips@linux-mips.org
+S:     Maintained
+F:     arch/mips/boot/dts/img/pistachio_marduk.dts
+
  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>
+M:     Russell King <linux@armlinux.org.uk>
  S:     Maintained
+T:     git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel
+T:     git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-fixes
  F:     drivers/gpu/drm/armada/
  F:     include/uapi/drm/armada_drm.h
  F:     Documentation/devicetree/bindings/display/armada/
@@ -7716,6 +7959,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
@@ -7734,6 +7978,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
@@ -7840,6 +8093,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
@@ -7847,12 +8118,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.*
@@ -7890,6 +8161,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
@@ -7901,7 +8181,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>
@@ -7998,6 +8285,15 @@ S:       Maintained
  F:     drivers/tty/serial/atmel_serial.c
  F:     include/linux/atmel_serial.h
  
+MICROCHIP / ATMEL DMA DRIVER
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     dmaengine@vger.kernel.org
+S:     Supported
+F:     drivers/dma/at_hdmac.c
+F:     drivers/dma/at_hdmac_regs.h
+F:     include/linux/platform_data/dma-atmel.h
+
  MICROCHIP / ATMEL ISC DRIVER
  M:     Songjun Wu <songjun.wu@microchip.com>
  L:     linux-media@vger.kernel.org
@@ -8006,6 +8302,14 @@ F:       drivers/media/platform/atmel/atmel-isc.c
  F:     drivers/media/platform/atmel/atmel-isc-regs.h
  F:     devicetree/bindings/media/atmel-isc.txt
  
+MICROCHIP USB251XB DRIVER
+M:     Richard Leitner <richard.leitner@skidata.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/misc/usb251xb.c
+F:     include/linux/platform_data/usb251xb.h
+F:     Documentation/devicetree/bindings/usb/usb251xb.txt
+
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:     Chen Yu <yu.c.chen@intel.com>
  L:     platform-driver-x86@vger.kernel.org
@@ -8128,6 +8432,7 @@ F:        drivers/media/dvb-frontends/mn88473*
  MODULE SUPPORT
  M:     Jessica Yu <jeyu@redhat.com>
  M:     Rusty Russell <rusty@rustcorp.com.au>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
  S:     Maintained
  F:     include/linux/module.h
  F:     kernel/module.c
@@ -8236,6 +8541,7 @@ S:        Supported
  F:     Documentation/devicetree/bindings/mfd/
  F:     drivers/mfd/
  F:     include/linux/mfd/
+F:     include/dt-bindings/mfd/
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  M:     Ulf Hansson <ulf.hansson@linaro.org>
@@ -8280,6 +8586,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
@@ -8326,7 +8638,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
@@ -8366,9 +8677,8 @@ F:        Documentation/networking/s2io.txt
  F:     Documentation/networking/vxge.txt
  F:     drivers/net/ethernet/neterion/
  
-NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)
+NETFILTER
  M:     Pablo Neira Ayuso <pablo@netfilter.org>
-M:     Patrick McHardy <kaber@trash.net>
  M:     Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  L:     netfilter-devel@vger.kernel.org
  L:     coreteam@netfilter.org
@@ -8413,10 +8723,10 @@ S:      Maintained
  F:     drivers/net/ethernet/netronome/
  
  NETWORK BLOCK DEVICE (NBD)
-M:     Markus Pargmann <mpa@pengutronix.de>
+M:     Josef Bacik <jbacik@fb.com>
  S:     Maintained
+L:     linux-block@vger.kernel.org
  L:     nbd-general@lists.sourceforge.net
-T:     git git://git.pengutronix.de/git/mpa/linux-nbd.git
  F:     Documentation/blockdev/nbd.txt
  F:     drivers/block/nbd.c
  F:     include/uapi/linux/nbd.h
@@ -8457,7 +8767,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>
@@ -8613,6 +8922,22 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
  S:     Maintained
  F:     arch/nios2/
  
+NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
+M:     Pavel Machek <pavel@ucw.cz>
+M:     Sakari Ailus <sakari.ailus@iki.fi>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/et8ek8
+F:     drivers/media/i2c/ad5820.c
+
+NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
+M:     Pavel Machek <pavel@ucw.cz>
+M:     Sakari Ailus <sakari.ailus@iki.fi>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/et8ek8
+F:     drivers/media/i2c/ad5820.c
+
  NOKIA N900 POWER SUPPLY DRIVERS
  R:     Pali Rohár <pali.rohar@gmail.com>
  F:     include/linux/power/bq2415x_charger.h
@@ -8648,7 +8973,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/
@@ -8672,20 +8997,35 @@ F:      drivers/video/fbdev/nvidia/
  NVM EXPRESS DRIVER
  M:     Keith Busch <keith.busch@intel.com>
  M:     Jens Axboe <axboe@fb.com>
+M:     Christoph Hellwig <hch@lst.de>
+M:     Sagi Grimberg <sagi@grimberg.me>
  L:     linux-nvme@lists.infradead.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
-W:     https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
+T:     git://git.infradead.org/nvme.git
+W:     http://git.infradead.org/nvme.git
  S:     Supported
  F:     drivers/nvme/host/
  F:     include/linux/nvme.h
+F:     include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS TARGET DRIVER
  M:     Christoph Hellwig <hch@lst.de>
  M:     Sagi Grimberg <sagi@grimberg.me>
  L:     linux-nvme@lists.infradead.org
+T:     git://git.infradead.org/nvme.git
+W:     http://git.infradead.org/nvme.git
  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>
@@ -8703,8 +9043,10 @@ S:       Supported
  F:     drivers/nfc/nxp-nci
  
  NXP TDA998X DRM DRIVER
-M:     Russell King <rmk+kernel@armlinux.org.uk>
+M:     Russell King <linux@armlinux.org.uk>
  S:     Supported
+T:     git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
+T:     git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
  F:     drivers/gpu/drm/i2c/tda998x_drv.c
  F:     include/drm/i2c/tda998x.h
  
@@ -8719,7 +9061,20 @@ M:       Josh Poimboeuf <jpoimboe@redhat.com>
  S:     Supported
  F:     tools/objtool/
  
-OMAP SUPPORT
+OMAP1 SUPPORT
+M:     Aaro Koskinen <aaro.koskinen@iki.fi>
+M:     Tony Lindgren <tony@atomide.com>
+L:     linux-omap@vger.kernel.org
+Q:     http://patchwork.kernel.org/project/linux-omap/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
+S:     Maintained
+F:     arch/arm/mach-omap1/
+F:     arch/arm/plat-omap/
+F:     arch/arm/configs/omap1_defconfig
+F:     drivers/i2c/busses/i2c-omap.c
+F:     include/linux/i2c-omap.h
+
+OMAP2+ SUPPORT
  M:     Tony Lindgren <tony@atomide.com>
  L:     linux-omap@vger.kernel.org
  W:     http://www.muru.com/linux/omap/
@@ -8727,8 +9082,8 @@ W:        http://linux.omap.com/
  Q:     http://patchwork.kernel.org/project/linux-omap/list/
  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  S:     Maintained
-F:     arch/arm/*omap*/
-F:     arch/arm/configs/omap1_defconfig
+F:     arch/arm/mach-omap2/
+F:     arch/arm/plat-omap/
  F:     arch/arm/configs/omap2plus_defconfig
  F:     drivers/i2c/busses/i2c-omap.c
  F:     drivers/irqchip/irq-omap-intc.c
@@ -8969,9 +9324,12 @@ 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>
+T:     git git://github.com/openrisc/linux.git
+L:     openrisc@lists.librecores.org
+W:     http://openrisc.io
  S:     Maintained
-T:     git git://openrisc.net/~jonas/linux
  F:     arch/openrisc/
  
  OPENVSWITCH
@@ -9103,7 +9461,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/
@@ -9151,6 +9509,14 @@ F:       drivers/video/fbdev/sti*
  F:     drivers/video/console/sti*
  F:     drivers/video/logo/logo_parisc*
  
+PARMAN
+M:     Jiri Pirko <jiri@mellanox.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     lib/parman.c
+F:     lib/test_parman.c
+F:     include/linux/parman.h
+
  PC87360 HARDWARE MONITORING DRIVER
  M:     Jim Cromie <jim.cromie@gmail.com>
  L:     linux-hwmon@vger.kernel.org
@@ -9237,7 +9603,7 @@ L:        linux-pci@vger.kernel.org
  L:     linux-arm-kernel@lists.infradead.org
  S:     Maintained
  F:     Documentation/devicetree/bindings/pci/pci-armada8k.txt
-F:     drivers/pci/host/pcie-armada8k.c
+F:     drivers/pci/dwc/pcie-armada8k.c
  
  PCI DRIVER FOR APPLIEDMICRO XGENE
  M:     Tanmay Inamdar <tinamdar@apm.com>
@@ -9255,7 +9621,7 @@ L:        linuxppc-dev@lists.ozlabs.org
  L:     linux-pci@vger.kernel.org
  L:     linux-arm-kernel@lists.infradead.org
  S:     Maintained
-F:     drivers/pci/host/*layerscape*
+F:     drivers/pci/dwc/*layerscape*
  
  PCI DRIVER FOR IMX6
  M:     Richard Zhu <hongxing.zhu@nxp.com>
@@ -9264,14 +9630,14 @@ 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*
+F:     drivers/pci/dwc/*imx6*
  
  PCI DRIVER FOR TI KEYSTONE
  M:     Murali Karicheri <m-karicheri2@ti.com>
  L:     linux-pci@vger.kernel.org
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:     Maintained
-F:     drivers/pci/host/*keystone*
+F:     drivers/pci/dwc/*keystone*
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
@@ -9303,7 +9669,7 @@ L:        linux-omap@vger.kernel.org
  L:     linux-pci@vger.kernel.org
  S:     Supported
  F:     Documentation/devicetree/bindings/pci/ti-pci.txt
-F:     drivers/pci/host/pci-dra7xx.c
+F:     drivers/pci/dwc/pci-dra7xx.c
  
  PCI DRIVER FOR RENESAS R-CAR
  M:     Simon Horman <horms@verge.net.au>
@@ -9318,7 +9684,7 @@ L:        linux-pci@vger.kernel.org
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:     Maintained
-F:     drivers/pci/host/pci-exynos.c
+F:     drivers/pci/dwc/pci-exynos.c
  
  PCI DRIVER FOR SYNOPSIS DESIGNWARE
  M:     Jingoo Han <jingoohan1@gmail.com>
@@ -9326,7 +9692,7 @@ 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/*designware*
+F:     drivers/pci/dwc/*designware*
  
  PCI DRIVER FOR GENERIC OF HOSTS
  M:     Will Deacon <will.deacon@arm.com>
@@ -9347,7 +9713,7 @@ PCIE DRIVER FOR ST SPEAR13XX
  M:     Pratyush Anand <pratyush.anand@gmail.com>
  L:     linux-pci@vger.kernel.org
  S:     Maintained
-F:     drivers/pci/host/*spear*
+F:     drivers/pci/dwc/*spear*
  
  PCI MSI DRIVER FOR ALTERA MSI IP
  M:     Ley Foon Tan <lftan@altera.com>
@@ -9372,7 +9738,7 @@ L:        linux-arm-kernel@axis.com
  L:     linux-pci@vger.kernel.org
  S:     Maintained
  F:     Documentation/devicetree/bindings/pci/axis,artpec*
-F:     drivers/pci/host/*artpec*
+F:     drivers/pci/dwc/*artpec*
  
  PCIE DRIVER FOR HISILICON
  M:     Zhou Wang <wangzhou1@hisilicon.com>
@@ -9380,7 +9746,7 @@ M:        Gabriele Paoloni <gabriele.paoloni@huawei.com>
  L:     linux-pci@vger.kernel.org
  S:     Maintained
  F:     Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
-F:     drivers/pci/host/pcie-hisi.c
+F:     drivers/pci/dwc/pcie-hisi.c
  
  PCIE DRIVER FOR ROCKCHIP
  M:     Shawn Lin <shawn.lin@rock-chips.com>
@@ -9396,7 +9762,7 @@ M:     Stanimir Varbanov <svarbanov@mm-sol.com>
  L:     linux-pci@vger.kernel.org
  L:     linux-arm-msm@vger.kernel.org
  S:     Maintained
-F:     drivers/pci/host/*qcom*
+F:     drivers/pci/dwc/*qcom*
  
  PCIE DRIVER FOR CAVIUM THUNDERX
  M:     David Daney <david.daney@cavium.com>
@@ -9518,7 +9884,7 @@ S:        Maintained
  F:     drivers/pinctrl/pinctrl-at91.*
  
  PIN CONTROLLER - ATMEL AT91 PIO4
-M:     Ludovic Desroches <ludovic.desroches@atmel.com>
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:     linux-gpio@vger.kernel.org
  S:     Supported
@@ -9570,12 +9936,12 @@ L:      linux-mips@linux-mips.org
  S:      Maintained
  F:      arch/mips/pistachio/
  F:      arch/mips/include/asm/mach-pistachio/
-F:      arch/mips/boot/dts/pistachio/
+F:      arch/mips/boot/dts/img/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
@@ -9650,7 +10016,7 @@ M:       Mark Rutland <mark.rutland@arm.com>
  M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  L:     linux-arm-kernel@lists.infradead.org
  S:     Maintained
-F:     drivers/firmware/psci.c
+F:     drivers/firmware/psci*.c
  F:     include/linux/psci.h
  F:     include/uapi/linux/psci.h
  
@@ -9714,6 +10080,14 @@ S:      Supported
  F:     Documentation/preempt-locking.txt
  F:     include/linux/preempt.h
  
+PRINTK
+M:     Petr Mladek <pmladek@suse.com>
+M:     Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+R:     Steven Rostedt <rostedt@goodmis.org>
+S:     Maintained
+F:     kernel/printk/
+F:     include/linux/printk.h
+
  PRISM54 WIRELESS DRIVER
  M:     "Luis R. Rodriguez" <mcgrof@gmail.com>
  L:     linux-wireless@vger.kernel.org
@@ -9749,17 +10123,27 @@ L:     linuxppc-dev@lists.ozlabs.org
  S:     Maintained
  F:     drivers/block/ps3vram.c
  
+PSAMPLE PACKET SAMPLING SUPPORT:
+M:     Yotam Gigi <yotamg@mellanox.com>
+S:     Maintained
+F:     net/psample
+F:     include/net/psample.h
+F:     include/uapi/linux/psample.h
+
  PSTORE FILESYSTEM
+M:     Kees Cook <keescook@chromium.org>
  M:     Anton Vorontsov <anton@enomsg.org>
  M:     Colin Cross <ccross@android.com>
-M:     Kees Cook <keescook@chromium.org>
  M:     Tony Luck <tony.luck@intel.com>
  S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
  F:     fs/pstore/
  F:     include/linux/pstore*
  F:     drivers/firmware/efi/efi-pstore.c
  F:     drivers/acpi/apei/erst.c
+F:     Documentation/admin-guide/ramoops.rst
+F:     Documentation/devicetree/bindings/reserved-memory/ramoops.txt
+K:     \b(pstore|ramoops)
  
  PTP HARDWARE CLOCK SUPPORT
  M:     Richard Cochran <richardcochran@gmail.com>
@@ -9789,7 +10173,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>
@@ -9810,7 +10194,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
@@ -9944,6 +10328,18 @@ 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/
+
+QLOGIC QL41xxx FCOE DRIVER
+M:     QLogic-Storage-Upstream@cavium.com
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/qedf/
+
  QNX4 FILESYSTEM
  M:     Anders Larsen <al@alarsen.net>
  W:     http://www.alarsen.net/linux/qnx4fs/
@@ -9952,6 +10348,13 @@ 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 <stuyoder@gmail.com>
+M:     Laurentiu Tudor <laurentiu.tudor@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
@@ -9965,7 +10368,6 @@ F:       drivers/media/tuners/qt1010*
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
  M:     QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
  L:     linux-wireless@vger.kernel.org
-L:     ath9k-devel@lists.ath9k.org
  W:     http://wireless.kernel.org/en/users/Drivers/ath9k
  S:     Supported
  F:     drivers/net/wireless/ath/ath9k/
@@ -10129,6 +10531,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>
@@ -10203,6 +10613,7 @@ S:      Maintained
  F:     drivers/rpmsg/
  F:     Documentation/rpmsg.txt
  F:     include/linux/rpmsg.h
+F:     include/linux/rpmsg/
  
  RENESAS CLOCK DRIVERS
  M:     Geert Uytterhoeven <geert+renesas@glider.be>
@@ -10217,6 +10628,12 @@ L:     linux-renesas-soc@vger.kernel.org
  F:     drivers/net/ethernet/renesas/
  F:     include/linux/sh_eth.h
  
+RENESAS R-CAR GYROADC DRIVER
+M:     Marek Vasut <marek.vasut@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+F:     drivers/iio/adc/rcar_gyro_adc.c
+
  RENESAS USB2 PHY DRIVER
  M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  L:     linux-renesas-soc@vger.kernel.org
@@ -10356,7 +10773,7 @@ F:      drivers/net/wireless/realtek/rtlwifi/
  F:     drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
-M:     Jes Sorensen <Jes.Sorensen@redhat.com>
+M:     Jes Sorensen <Jes.Sorensen@gmail.com>
  L:     linux-wireless@vger.kernel.org
  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  S:     Maintained
@@ -10414,7 +10831,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
@@ -10581,7 +10998,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
@@ -10609,6 +11026,20 @@ S:     Maintained
  F:     Documentation/devicetree/bindings/serial/
  F:     drivers/tty/serial/
  
+SERIAL DEVICE BUS
+M:     Rob Herring <robh@kernel.org>
+L:     linux-serial@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/serial/slave-device.txt
+F:     drivers/tty/serdev/
+F:     include/linux/serdev.h
+
+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
@@ -10616,6 +11047,13 @@ S:     Maintained
  F:     drivers/staging/media/st-cec/
  F:     Documentation/devicetree/bindings/media/stih-cec.txt
  
+SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
+M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
+L:     linux-s390@vger.kernel.org
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+F:     net/smc/
+
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:     Viresh Kumar <vireshk@kernel.org>
  M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -10624,13 +11062,6 @@ F:     include/linux/dma/dw.h
  F:     include/linux/platform_data/dma-dw.h
  F:     drivers/dma/dw/
  
-SYNOPSYS DESIGNWARE ETHERNET QOS 4.10a driver
-M: Lars Persson <lars.persson@axis.com>
-L: netdev@vger.kernel.org
-S: Supported
-F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
-F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
-
  SYNOPSYS DESIGNWARE I2C DRIVER
  M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
  R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -10644,7 +11075,6 @@ SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
  M:     Jaehoon Chung <jh80.chung@samsung.com>
  L:     linux-mmc@vger.kernel.org
  S:     Maintained
-F:     include/linux/mmc/dw_mmc.h
  F:     drivers/mmc/host/dw_mmc*
  
  SYSTEM TRACE MODULE CLASS
@@ -10707,6 +11137,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
@@ -10842,6 +11277,17 @@ L:     linux-mmc@vger.kernel.org
  S:     Maintained
  F:     drivers/mmc/host/sdhci-spear.c
  
+SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
+M:     Scott Bauer <scott.bauer@intel.com>
+M:     Jonathan Derrick <jonathan.derrick@intel.com>
+M:     Rafael Antognolli <rafael.antognolli@intel.com>
+L:     linux-block@vger.kernel.org
+S:     Supported
+F:     block/sed*
+F:     block/opal_proto.h
+F:     include/linux/sed*
+F:     include/uapi/linux/sed*
+
  SECURITY SUBSYSTEM
  M:     James Morris <james.l.morris@oracle.com>
  M:     "Serge E. Hallyn" <serge@hallyn.com>
@@ -10915,7 +11361,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
@@ -11023,6 +11468,14 @@ F:     drivers/media/usb/siano/
  F:     drivers/media/usb/siano/
  F:     drivers/media/mmc/siano/
  
+SILEAD TOUCHSCREEN DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-input@vger.kernel.org
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/input/touchscreen/silead.c
+F:     drivers/platform/x86/silead_dmi.c
+
  SIMPLEFB FB DRIVER
  M:     Hans de Goede <hdegoede@redhat.com>
  L:     linux-fbdev@vger.kernel.org
@@ -11069,6 +11522,13 @@ F:     arch/arm/mach-s3c24xx/mach-bast.c
  F:     arch/arm/mach-s3c24xx/bast-ide.c
  F:     arch/arm/mach-s3c24xx/bast-irq.c
  
+SIPHASH PRF ROUTINES
+M:     Jason A. Donenfeld <Jason@zx2c4.com>
+S:     Maintained
+F:     lib/siphash.c
+F:     lib/test_siphash.c
+F:     include/linux/siphash.h
+
  TI DAVINCI MACHINE SUPPORT
  M:     Sekhar Nori <nsekhar@ti.com>
  M:     Kevin Hilman <khilman@kernel.org>
@@ -11110,7 +11570,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*
@@ -11472,7 +11932,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>
@@ -11538,17 +11998,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>
@@ -11646,6 +12100,7 @@ F:      include/linux/swiotlb.h
  
  SWITCHDEV
  M:     Jiri Pirko <jiri@resnulli.us>
+M:     Ivan Vecera <ivecera@redhat.com>
  L:     netdev@vger.kernel.org
  S:     Supported
  F:     net/switchdev/
@@ -11658,6 +12113,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
  
@@ -11918,6 +12374,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
@@ -12348,6 +12814,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
@@ -12404,7 +12876,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*
@@ -12721,7 +13194,7 @@ USERSPACE I/O (UIO)
  M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:     Maintained
  T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
-F:     Documentation/DocBook/uio-howto.tmpl
+F:     Documentation/driver-api/uio-howto.rst
  F:     drivers/uio/
  F:     include/linux/uio*.h
  
@@ -12762,6 +13235,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
@@ -12797,7 +13279,7 @@ F:      drivers/input/serio/userio.c
  F:     include/uapi/linux/userio.h
  
  VIRTIO CONSOLE DRIVER
-M:     Amit Shah <amit.shah@redhat.com>
+M:     Amit Shah <amit@kernel.org>
  L:     virtualization@lists.linux-foundation.org
  S:     Maintained
  F:     drivers/char/virtio_console.c
@@ -12816,6 +13298,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>
@@ -12831,6 +13314,7 @@ M:      David Airlie <airlied@linux.ie>
  M:     Gerd Hoffmann <kraxel@redhat.com>
  L:     dri-devel@lists.freedesktop.org
  L:     virtualization@lists.linux-foundation.org
+T:     git git://git.kraxel.org/linux drm-qemu
  S:     Maintained
  F:     drivers/gpu/drm/virtio/
  F:     include/uapi/linux/virtio_gpu.h
@@ -12852,6 +13336,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
@@ -12914,7 +13406,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*
@@ -12956,6 +13448,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>
@@ -13088,10 +13587,8 @@ S:     Maintained
  F:     drivers/input/misc/wistron_btns.c
  
  WL3501 WIRELESS PCMCIA CARD DRIVER
-M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  L:     linux-wireless@vger.kernel.org
-W:     http://oops.ghostprotocols.net:81/blog
-S:     Maintained
+S:     Odd fixes
  F:     drivers/net/wireless/wl3501*
  
  WOLFSON MICROELECTRONICS DRIVERS
@@ -13139,7 +13636,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>
@@ -13168,6 +13665,7 @@ F:      arch/x86/
  
  X86 PLATFORM DRIVERS
  M:     Darren Hart <dvhart@infradead.org>
+M:     Andy Shevchenko <andy@infradead.org>
  L:     platform-driver-x86@vger.kernel.org
  T:     git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
  S:     Maintained
@@ -13204,7 +13702,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
@@ -13270,11 +13767,11 @@ F:    arch/x86/xen/*swiotlb*
  F:     drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
-M:     Dave Chinner <david@fromorbit.com>
+M:     Darrick J. Wong <darrick.wong@oracle.com>
  M:     linux-xfs@vger.kernel.org
  L:     linux-xfs@vger.kernel.org
  W:     http://xfs.org/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
+T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:     Supported
  F:     Documentation/filesystems/xfs.txt
  F:     fs/xfs/
@@ -13340,6 +13837,7 @@ F:      drivers/net/hamradio/z8530.h
  
  ZBUD COMPRESSED PAGE ALLOCATOR
  M:     Seth Jennings <sjenning@redhat.com>
+M:     Dan Streetman <ddstreet@ieee.org>
  L:     linux-mm@kvack.org
  S:     Maintained
  F:     mm/zbud.c
@@ -13354,6 +13852,24 @@ L:     zd1211-devs@lists.sourceforge.net (subscribers-only)
  S:     Maintained
  F:     drivers/net/wireless/zydas/zd1211rw/
  
+ZD1301_DEMOD MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+W:     https://linuxtv.org/
+W:     http://palosaari.fi/linux/
+Q:     https://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/dvb-frontends/zd1301_demod*
+
+ZD1301 MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+W:     https://linuxtv.org/
+W:     http://palosaari.fi/linux/
+Q:     https://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/usb/dvb-usb-v2/zd1301*
+
  ZPOOL COMPRESSED PAGE STORAGE API
  M:     Dan Streetman <ddstreet@ieee.org>
  L:     linux-mm@kvack.org
@@ -13395,6 +13911,7 @@ F:      Documentation/vm/zsmalloc.txt
  
  ZSWAP COMPRESSED SWAP CACHING
  M:     Seth Jennings <sjenning@redhat.com>
+M:     Dan Streetman <ddstreet@ieee.org>
  L:     linux-mm@kvack.org
  S:     Maintained
  F:     mm/zswap.c