Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk updates from Stephen Boyd:
 "The diff is dominated by the Allwinner A10/A20 SoCs getting converted
  to the sunxi-ng framework. Otherwise, the heavy hitters are various
  drivers for SoCs like AT91, Amlogic, Renesas, and Rockchip. There are
  some other new clk drivers in here too but overall this is just a
  bunch of clk drivers for various different pieces of hardware and a
  collection of non-critical fixes for clk drivers.

  New Drivers:
   - Allwinner R40 SoCs
   - Renesas R-Car Gen3 USB 2.0 clock selector PHY
   - Atmel AT91 audio PLL
   - Uniphier PXs3 SoCs
   - ARC HSDK Board PLLs
   - AXS10X Board PLLs
   - STMicroelectronics STM32H743 SoCs

  Removed Drivers:
   - Non-compiling mb86s7x support

  Updates:
   - Allwinner A10/A20 SoCs converted to sunxi-ng framework
   - Allwinner H3 CPU clk fixes
   - Renesas R-Car D3 SoC
   - Renesas V2H and M3-W modules
   - Samsung Exynos5420/5422/5800 audio fixes
   - Rockchip fractional clk approximation fixes
   - Rockchip rk3126 SoC support within the rk3128 driver
   - Amlogic gxbb CEC32 and sd_emmc clks
   - Amlogic meson8b reset controller support
   - IDT VersaClock 5P49V5925/5P49V6901 support
   - Qualcomm MSM8996 SMMU clks
   - Various 'const' applications for struct clk_ops
   - si5351 PLL reset bugfix
   - Uniphier audio on LD11/LD20 and ethernet support on LD11/LD20/Pro4/PXs2
   - Assorted Tegra clk driver fixes"

* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (120 commits)
  clk: si5351: fix PLL reset
  ASoC: atmel-classd: remove aclk clock
  ASoC: atmel-classd: remove aclk clock from DT binding
  clk: at91: clk-generated: make gclk determine audio_pll rate
  clk: at91: clk-generated: create function to find best_diff
  clk: at91: add audio pll clock drivers
  dt-bindings: clk: at91: add audio plls to the compatible list
  clk: at91: clk-generated: remove useless divisor loop
  clk: mb86s7x: Drop non-building driver
  clk: ti: check for null return in strrchr to avoid null dereferencing
  clk: Don't write error code into divider register
  clk: uniphier: add video input subsystem clock
  clk: uniphier: add audio system clock
  clk: stm32h7: Add stm32h743 clock driver
  clk: gate: expose clk_gate_ops::is_enabled
  clk: nxp: clk-lpc32xx: rename clk_gate_is_enabled()
  clk: uniphier: add PXs3 clock data
  clk: hi6220: change watchdog clock source
  clk: Kconfig: Name RK805 in Kconfig for COMMON_CLK_RK808
  clk: cs2000: Add cs2000_set_saved_rate
  ...

diff --combined Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
index faa6d8ac583412557118a53c3bebb22ea0ab159a,64884ede493820a822260298b2116cdfe50ea9ac..786dc39ca904ddd02ede6af5b7617fb9ef2e7d32
--- 1/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
--- 2/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
+++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
@@@ -5,9 -5,11 +5,11 @@@ controllers within the Always-On part o
  
  Required Properties:
  
- - compatible: should be "amlogic,gxbb-aoclkc"
- - reg: physical base address of the clock controller and length of memory
-        mapped region.
+ - compatible: value should be different for each SoC family as :
+       - GXBB (S905) : "amlogic,meson-gxbb-aoclkc"
+       - GXL (S905X, S905D) : "amlogic,meson-gxl-aoclkc"
+       - GXM (S912) : "amlogic,meson-gxm-aoclkc"
+       followed by the common "amlogic,meson-gx-aoclkc"
  
  - #clock-cells: should be 1.
  
@@@ -23,14 -25,22 +25,22 @@@ to specify the reset which they consume
  preprocessor macros in the dt-bindings/reset/gxbb-aoclkc.h header and can be
  used in device tree sources.
  
+ Parent node should have the following properties :
+ - compatible: "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd"
+ - reg: base address and size of the AO system control register space.
+ 
  Example: AO Clock controller node:
  
-       clkc_AO: clock-controller@040 {
-               compatible = "amlogic,gxbb-aoclkc";
-               reg = <0x0 0x040 0x0 0x4>;
+ ao_sysctrl: sys-ctrl@0 {
+       compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd";
+       reg =  <0x0 0x0 0x0 0x100>;
+ 
+       clkc_AO: clock-controller {
+               compatible = "amlogic,meson-gxbb-aoclkc", "amlogic,meson-gx-aoclkc";
                #clock-cells = <1>;
                #reset-cells = <1>;
        };
+ };
  
  Example: UART controller node that consumes the clock and reset generated
    by the clock controller:
@@@ -41,4 -51,5 +51,4 @@@
                interrupts = <0 90 1>;
                clocks = <&clkc_AO CLKID_AO_UART1>;
                resets = <&clkc_AO RESET_AO_UART1>;
 -              status = "disabled";
        };

diff --combined Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
index 707a686d8d3e1341376b9f94de0296e43ba6c77b,27cec325853852fc1a5360cefd06f1fded968a13..316e136865688b7c4fe0c6f1d7b23934d66634d1
--- 1/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
--- 2/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
@@@ -22,6 -22,7 +22,7 @@@ Required Properties
        - "renesas,r8a7794-cpg-mssr" for the r8a7794 SoC (R-Car E2)
        - "renesas,r8a7795-cpg-mssr" for the r8a7795 SoC (R-Car H3)
        - "renesas,r8a7796-cpg-mssr" for the r8a7796 SoC (R-Car M3-W)
+       - "renesas,r8a77995-cpg-mssr" for the r8a77995 SoC (R-Car D3)
  
    - reg: Base address and length of the memory resource used by the CPG/MSSR
      block
@@@ -30,7 -31,7 +31,7 @@@
      clock-names
    - clock-names: List of external parent clock names. Valid names are:
        - "extal" (r8a7743, r8a7745, r8a7790, r8a7791, r8a7792, r8a7793, r8a7794,
-                r8a7795, r8a7796)
+                r8a7795, r8a7796, r8a77995)
        - "extalr" (r8a7795, r8a7796)
        - "usb_extal" (r8a7743, r8a7745, r8a7790, r8a7791, r8a7793, r8a7794)
  
@@@ -81,4 -82,5 +82,4 @@@ Example
                dma-names = "tx", "rx";
                power-domains = <&cpg>;
                resets = <&cpg 310>;
 -              status = "disabled";
        };

diff --combined MAINTAINERS
index 048586a2a9be36c1f489b9ac6a489927e9ee56e3,cf704c7df2f0781b1f2f508d007d6e91a764286d..7be4129ec9514bf17e1327a0a1f137c74772dfe1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -205,6 -205,7 +205,6 @@@ F: include/net/9p
  F:    include/uapi/linux/virtio_9p.h
  F:    include/trace/events/9p.h
  
 -
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -301,7 -302,6 +301,7 @@@ S: Supporte
  F:    drivers/acpi/
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
 +F:    include/linux/fwnode.h
  F:    include/acpi/
  F:    Documentation/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
@@@ -311,14 -311,6 +311,14 @@@ F:       drivers/pci/*/*acpi
  F:    drivers/pci/*/*/*acpi*
  F:    tools/power/acpi/
  
 +ACPI APEI
 +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    Len Brown <lenb@kernel.org>
 +L:    linux-acpi@vger.kernel.org
 +R:    Tony Luck <tony.luck@intel.com>
 +R:    Borislav Petkov <bp@alien8.de>
 +F:    drivers/acpi/apei/
 +
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <robert.moore@intel.com>
  M:    Lv Zheng <lv.zheng@intel.com>
@@@ -500,6 -492,13 +500,6 @@@ S:        Maintaine
  F:    Documentation/hwmon/adt7475
  F:    drivers/hwmon/adt7475.c
  
 -ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
 -M:    Michael Hennerich <michael.hennerich@analog.com>
 -W:    http://wiki.analog.com/ADXL345
 -W:    http://ez.analog.com/community/linux-device-drivers
 -S:    Supported
 -F:    drivers/input/misc/adxl34x.c
 -
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <matthew@wil.cx>
  M:    Hannes Reinecke <hare@suse.com>
@@@ -508,13 -507,6 +508,13 @@@ S:       Maintaine
  F:    Documentation/scsi/advansys.txt
  F:    drivers/scsi/advansys.c
  
 +ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +W:    http://wiki.analog.com/ADXL345
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/input/misc/adxl34x.c
 +
  AEDSP16 DRIVER
  M:    Riccardo Facchetti <fizban@tin.it>
  S:    Maintained
@@@ -778,12 -770,6 +778,12 @@@ W:       http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/media/i2c/adv7180.c
  
 +ANALOG DEVICES INC ADV748X DRIVER
 +M:    Kieran Bingham <kieran.bingham@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/adv748x/*
 +
  ANALOG DEVICES INC ADV7511 DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -822,12 -808,6 +822,12 @@@ W:       http://blackfin.uclinux.org
  S:    Supported
  F:    sound/soc/blackfin/*
  
 +ANALOG DEVICES INC DMA DRIVERS
 +M:    Lars-Peter Clausen <lars@metafoo.de>
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/dma/dma-axi-dmac.c
 +
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  M:    Michael Hennerich <Michael.Hennerich@analog.com>
@@@ -840,6 -820,12 +840,6 @@@ X:        drivers/iio/*/adjd
  F:    drivers/staging/iio/*/ad*
  F:    drivers/staging/iio/trigger/iio-trig-bfin-timer.c
  
 -ANALOG DEVICES INC DMA DRIVERS
 -M:    Lars-Peter Clausen <lars@metafoo.de>
 -W:    http://ez.analog.com/community/linux-device-drivers
 -S:    Supported
 -F:    drivers/dma/dma-axi-dmac.c
 -
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <robh@kernel.org>
  S:    Supported
@@@ -855,12 -841,6 +855,12 @@@ S:       Supporte
  F:    drivers/android/
  F:    drivers/staging/android/
  
 +ANDROID GOLDFISH RTC DRIVER
 +M:    Miodrag Dinic <miodrag.dinic@imgtec.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
 +F:    drivers/rtc/rtc-goldfish.c
 +
  ANDROID ION DRIVER
  M:    Laura Abbott <labbott@redhat.com>
  M:    Sumit Semwal <sumit.semwal@linaro.org>
@@@ -892,15 -872,6 +892,15 @@@ F:       include/linux/apm_bios.
  F:    include/uapi/linux/apm_bios.h
  F:    drivers/char/apm-emulation.c
  
 +APPARMOR SECURITY MODULE
 +M:    John Johansen <john.johansen@canonical.com>
 +L:    apparmor@lists.ubuntu.com (subscribers-only, general discussion)
 +W:    apparmor.wiki.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
 +S:    Supported
 +F:    security/apparmor/
 +F:    Documentation/admin-guide/LSM/apparmor.rst
 +
  APPLE BCM5974 MULTITOUCH DRIVER
  M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    linux-input@vger.kernel.org
@@@ -924,18 -895,6 +924,18 @@@ M:       Duc Dang <dhdang@apm.com
  S:    Supported
  F:    arch/arm64/boot/dts/apm/
  
 +APPLIED MICRO (APM) X-GENE SOC EDAC
 +M:    Loc Ho <lho@apm.com>
 +S:    Supported
 +F:    drivers/edac/xgene_edac.c
 +F:    Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
 +
 +APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
 +M:    Iyappan Subramanian <isubramanian@apm.com>
 +M:    Keyur Chudgar <kchudgar@apm.com>
 +S:    Supported
 +F:    drivers/net/ethernet/apm/xgene-v2/
 +
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
  M:    Iyappan Subramanian <isubramanian@apm.com>
  M:    Keyur Chudgar <kchudgar@apm.com>
@@@ -946,6 -905,12 +946,6 @@@ F:        drivers/net/phy/mdio-xgene.
  F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  
 -APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
 -M:    Iyappan Subramanian <isubramanian@apm.com>
 -M:    Keyur Chudgar <kchudgar@apm.com>
 -S:    Supported
 -F:    drivers/net/ethernet/apm/xgene-v2/
 -
  APPLIED MICRO (APM) X-GENE SOC PMU
  M:    Tai Nguyen <ttnguyen@apm.com>
  S:    Supported
@@@ -965,12 -930,6 +965,12 @@@ S:       Maintaine
  F:    drivers/video/fbdev/arcfb.c
  F:    drivers/video/fbdev/core/fb_defio.c
  
 +ARC PGU DRM DRIVER
 +M:    Alexey Brodkin <abrodkin@synopsys.com>
 +S:    Supported
 +F:    drivers/gpu/drm/arc/
 +F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
 +
  ARCNET NETWORK LAYER
  M:    Michael Grzeschik <m.grzeschik@pengutronix.de>
  L:    netdev@vger.kernel.org
@@@ -978,6 -937,12 +978,6 @@@ S:        Maintaine
  F:    drivers/net/arcnet/
  F:    include/uapi/linux/if_arcnet.h
  
 -ARC PGU DRM DRIVER
 -M:    Alexey Brodkin <abrodkin@synopsys.com>
 -S:    Supported
 -F:    drivers/gpu/drm/arc/
 -F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
 -
  ARM ARCHITECTED TIMER DRIVER
  M:    Mark Rutland <mark.rutland@arm.com>
  M:    Marc Zyngier <marc.zyngier@arm.com>
@@@ -1030,17 -995,18 +1030,17 @@@ S:    Maintaine
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git
  F:    arch/arm/
  
 -ARM SUB-ARCHITECTURES
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-*/
 -F:    arch/arm/plat-*/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 -
  ARM PRIMECELL AACI PL041 DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
  F:    sound/arm/aaci.*
  
 +ARM PRIMECELL BUS SUPPORT
 +M:    Russell King <linux@armlinux.org.uk>
 +S:    Maintained
 +F:    drivers/amba/
 +F:    include/linux/amba/bus.h
 +
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
@@@ -1064,22 -1030,11 +1064,22 @@@ S:   Maintaine
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
 -ARM PRIMECELL BUS SUPPORT
 -M:    Russell King <linux@armlinux.org.uk>
 +ARM SMMU DRIVERS
 +M:    Will Deacon <will.deacon@arm.com>
 +R:    Robin Murphy <robin.murphy@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/amba/
 -F:    include/linux/amba/bus.h
 +F:    drivers/iommu/arm-smmu.c
 +F:    drivers/iommu/arm-smmu-v3.c
 +F:    drivers/iommu/io-pgtable-arm.c
 +F:    drivers/iommu/io-pgtable-arm-v7s.c
 +
 +ARM SUB-ARCHITECTURES
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-*/
 +F:    arch/arm/plat-*/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
  
  ARM/ACTIONS SEMI ARCHITECTURE
  M:    Andreas Färber <afaerber@suse.de>
@@@ -1112,11 -1067,6 +1112,11 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/Allwinner SoC Clock Support
 +M:    Emilio López <emilio@elopez.com.ar>
 +S:    Maintained
 +F:    drivers/clk/sunxi/
 +
  ARM/Allwinner sunXi SoC support
  M:    Maxime Ripard <maxime.ripard@free-electrons.com>
  M:    Chen-Yu Tsai <wens@csie.org>
@@@ -1131,15 -1081,10 +1131,15 @@@ F:   drivers/pinctrl/sunxi
  F:    drivers/soc/sunxi/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
  
 -ARM/Allwinner SoC Clock Support
 -M:    Emilio López <emilio@elopez.com.ar>
 +ARM/Amlogic Meson SoC CLOCK FRAMEWORK
 +M:    Neil Armstrong <narmstrong@baylibre.com>
 +M:    Jerome Brunet <jbrunet@baylibre.com>
 +L:    linux-amlogic@lists.infradead.org
  S:    Maintained
 -F:    drivers/clk/sunxi/
 +F:    drivers/clk/meson/
 +F:    include/dt-bindings/clock/meson*
 +F:    include/dt-bindings/clock/gxbb*
 +F:    Documentation/devicetree/bindings/clock/amlogic*
  
  ARM/Amlogic Meson SoC support
  M:    Carlo Caione <carlo@caione.org>
@@@ -1151,10 -1096,20 +1151,10 @@@ S:   Maintaine
  F:    arch/arm/mach-meson/
  F:    arch/arm/boot/dts/meson*
  F:    arch/arm64/boot/dts/amlogic/
 -F:    drivers/pinctrl/meson/
 +F:    drivers/pinctrl/meson/
  F:    drivers/mmc/host/meson*
  N:    meson
  
 -ARM/Amlogic Meson SoC CLOCK FRAMEWORK
 -M:    Neil Armstrong <narmstrong@baylibre.com>
 -M:    Jerome Brunet <jbrunet@baylibre.com>
 -L:    linux-amlogic@lists.infradead.org
 -S:    Maintained
 -F:    drivers/clk/meson/
 -F:    include/dt-bindings/clock/meson*
 -F:    include/dt-bindings/clock/gxbb*
 -F:    Documentation/devicetree/bindings/clock/amlogic*
 -
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <tsahee@annapurnalabs.com>
  M:    Antoine Tenart <antoine.tenart@free-electrons.com>
@@@ -1174,34 -1129,28 +1174,34 @@@ L:   linux-arm-kernel@axis.co
  F:    arch/arm/mach-artpec
  F:    arch/arm/boot/dts/artpec6*
  F:    drivers/clk/axis
 +F:    drivers/crypto/axis
  F:    drivers/pinctrl/pinctrl-artpec*
  F:    Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
  
 -ARM/ASPEED MACHINE SUPPORT
 -M:    Joel Stanley <joel@jms.id.au>
 -S:    Maintained
 -F:    arch/arm/mach-aspeed/
 -F:    arch/arm/boot/dts/aspeed-*
 -F:    drivers/*/*aspeed*
 -
  ARM/ASPEED I2C DRIVER
  M:    Brendan Higgins <brendanhiggins@google.com>
  R:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
  R:    Joel Stanley <joel@jms.id.au>
  L:    linux-i2c@vger.kernel.org
 -L:    openbmc@lists.ozlabs.org
 +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/irqchip/irq-aspeed-i2c-ic.c
  F:    drivers/i2c/busses/i2c-aspeed.c
  F:    Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.txt
  F:    Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
  
 +ARM/ASPEED MACHINE SUPPORT
 +M:    Joel Stanley <joel@jms.id.au>
 +S:    Maintained
 +F:    arch/arm/mach-aspeed/
 +F:    arch/arm/boot/dts/aspeed-*
 +F:    drivers/*/*aspeed*
 +
 +ARM/ATMEL AT91 Clock Support
 +M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +S:    Maintained
 +F:    drivers/clk/at91
 +
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@@ -1218,6 -1167,11 +1218,6 @@@ F:     arch/arm/boot/dts/sama*.dts
  F:    arch/arm/include/debug/at91.S
  F:    drivers/memory/atmel*
  
 -ARM/ATMEL AT91 Clock Support
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 -S:    Maintained
 -F:    drivers/clk/at91
 -
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1244,11 -1198,6 +1244,11 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Odd Fixes
  N:    clps711x
  
 +ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 +M:    Lennert Buytenhek <kernel@wantstofly.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
  M:    Alexander Sverdlin <alexander.sverdlin@gmail.com>
@@@ -1257,6 -1206,11 +1257,6 @@@ S:     Maintaine
  F:    arch/arm/mach-ep93xx/
  F:    arch/arm/mach-ep93xx/include/mach/
  
 -ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/CLKDEV SUPPORT
  M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1270,13 -1224,6 +1270,13 @@@ M:    Mike Rapoport <mike@compulab.co.il
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
 +M:    Baruch Siach <baruch@tkos.co.il>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/boot/dts/cx92755*
 +N:    digicolor
 +
  ARM/CONTEC MICRO9 MACHINE SUPPORT
  M:    Hubert Feurstein <hubert.feurstein@contec.at>
  S:    Maintained
@@@ -1304,15 -1251,10 +1304,15 @@@ S:   Maintaine
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Hans Ulli Kroll <ulli.kroll@googlemail.com>
 +M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/ulli-kroll/linux.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/gemini.txt
 +F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 +F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
@@@ -1327,6 -1269,13 +1327,6 @@@ F:     drivers/clocksource/timer-prima2.
  F:    drivers/clocksource/timer-atlas7.c
  N:    [^a-z]sirf
  
 -ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
 -M:    Baruch Siach <baruch@tkos.co.il>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/boot/dts/cx92755*
 -N:    digicolor
 -
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1440,11 -1389,6 +1440,11 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-pxa/colibri-pxa270-income.c
  
 +ARM/INTEL IOP13XX ARM ARCHITECTURE
 +M:    Lennert Buytenhek <kernel@wantstofly.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1454,6 -1398,11 +1454,6 @@@ ARM/INTEL IOP33X ARM ARCHITECTUR
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Orphan
  
 -ARM/INTEL IOP13XX ARM ARCHITECTURE
 -M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1488,6 -1437,39 +1488,6 @@@ M:     Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 -M:    Santosh Shilimkar <ssantosh@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-keystone/
 -F:    arch/arm/boot/dts/keystone-*
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 -
 -ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
 -M:    Santosh Shilimkar <ssantosh@kernel.org>
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -F:    drivers/clk/keystone/
 -
 -ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 -M:    Santosh Shilimkar <ssantosh@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -F:    drivers/clocksource/timer-keystone.c
 -
 -ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
 -M:    Santosh Shilimkar <ssantosh@kernel.org>
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -F:    drivers/power/reset/keystone-reset.c
 -
 -ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 -M:    Santosh Shilimkar <ssantosh@kernel.org>
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -F:    drivers/memory/*emif*
 -
  ARM/LG1K ARCHITECTURE
  M:    Chanho Min <chanho.min@lge.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1530,6 -1512,24 +1530,6 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <philipp.zabel@gmail.com>
  S:    Maintained
  
 -ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
 -M:    Jason Cooper <jason@lakedaemon.net>
 -M:    Andrew Lunn <andrew@lunn.ch>
 -M:    Gregory Clement <gregory.clement@free-electrons.com>
 -M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/boot/dts/armada*
 -F:    arch/arm/boot/dts/kirkwood*
 -F:    arch/arm/configs/mvebu_*_defconfig
 -F:    arch/arm/mach-mvebu/
 -F:    arch/arm64/boot/dts/marvell/armada*
 -F:    drivers/cpufreq/mvebu-cpufreq.c
 -F:    drivers/irqchip/irq-armada-370-xp.c
 -F:    drivers/irqchip/irq-mvebu-*
 -F:    drivers/pinctrl/mvebu/
 -F:    drivers/rtc/rtc-armada38x.c
 -
  ARM/Marvell Berlin SoC support
  M:    Jisheng Zhang <jszhang@marvell.com>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -1539,6 -1539,7 +1539,6 @@@ F:      arch/arm/mach-berlin
  F:    arch/arm/boot/dts/berlin*
  F:    arch/arm64/boot/dts/marvell/berlin*
  
 -
  ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
@@@ -1554,23 -1555,24 +1554,23 @@@ F:   arch/arm/plat-orion
  F:    arch/arm/boot/dts/dove*
  F:    arch/arm/boot/dts/orion5x*
  
 -
 -ARM/Orion SoC/Technologic Systems TS-78xx platform support
 -M:    Alexander Clouter <alex@digriz.org.uk>
 +ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
 +M:    Jason Cooper <jason@lakedaemon.net>
 +M:    Andrew Lunn <andrew@lunn.ch>
 +M:    Gregory Clement <gregory.clement@free-electrons.com>
 +M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.digriz.org.uk/ts78xx/kernel
  S:    Maintained
 -F:    arch/arm/mach-orion5x/ts78xx-*
 -
 -ARM/OXNAS platform support
 -M:    Neil Armstrong <narmstrong@baylibre.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-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
 +F:    arch/arm/boot/dts/armada*
 +F:    arch/arm/boot/dts/kirkwood*
 +F:    arch/arm/configs/mvebu_*_defconfig
 +F:    arch/arm/mach-mvebu/
 +F:    arch/arm64/boot/dts/marvell/armada*
 +F:    drivers/cpufreq/mvebu-cpufreq.c
 +F:    drivers/irqchip/irq-armada-370-xp.c
 +F:    drivers/irqchip/irq-mvebu-*
 +F:    drivers/pinctrl/mvebu/
 +F:    drivers/rtc/rtc-armada38x.c
  
  ARM/Mediatek RTC DRIVER
  M:    Eddie Huang <eddie.huang@mediatek.com>
@@@ -1597,7 -1599,7 +1597,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/phy/phy-mt65xx-usb3.c
 +F:    drivers/phy/mediatek/phy-mtk-tphy.c
  
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <gerg@uclinux.org>
@@@ -1625,53 -1627,16 +1625,53 @@@ F:   drivers/pinctrl/nomadik
  F:    drivers/i2c/busses/i2c-nomadik.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
 +ARM/NUVOTON W90X900 ARM ARCHITECTURE
 +M:    Wan ZongShun <mcuos.com@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +W:    http://www.mcuos.com
 +S:    Maintained
 +F:    arch/arm/mach-w90x900/
 +F:    drivers/input/keyboard/w90p910_keypad.c
 +F:    drivers/input/touchscreen/w90p910_ts.c
 +F:    drivers/watchdog/nuc900_wdt.c
 +F:    drivers/net/ethernet/nuvoton/w90p910_ether.c
 +F:    drivers/mtd/nand/nuc900_nand.c
 +F:    drivers/rtc/rtc-nuc900.c
 +F:    drivers/spi/spi-nuc900.c
 +F:    drivers/usb/host/ehci-w90x900.c
 +F:    drivers/video/fbdev/nuc900fb.c
 +
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  M:    Nelson Castillo <arhuaco@freaks-unidos.net>
  L:    openmoko-kernel@lists.openmoko.org (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
  S:    Supported
  
 -ARM/TOSA MACHINE SUPPORT
 -M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 -M:    Dirk Opfer <dirk@opfer-online.de>
 +ARM/Orion SoC/Technologic Systems TS-78xx platform support
 +M:    Alexander Clouter <alex@digriz.org.uk>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +W:    http://www.digriz.org.uk/ts78xx/kernel
 +S:    Maintained
 +F:    arch/arm/mach-orion5x/ts78xx-*
 +
 +ARM/OXNAS platform support
 +M:    Neil Armstrong <narmstrong@baylibre.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-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/PALM TREO SUPPORT
 +M:    Tomas Cech <sleep_walker@suse.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +W:    http://hackndev.com
  S:    Maintained
 +F:    arch/arm/mach-pxa/include/mach/palmtreo.h
 +F:    arch/arm/mach-pxa/palmtreo.c
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
  M:    Marek Vasut <marek.vasut@gmail.com>
@@@ -1689,6 -1654,14 +1689,6 @@@ F:     arch/arm/mach-pxa/palmte2.
  F:    arch/arm/mach-pxa/include/mach/palmtc.h
  F:    arch/arm/mach-pxa/palmtc.c
  
 -ARM/PALM TREO SUPPORT
 -M:    Tomas Cech <sleep_walker@suse.com>
 -L:    linux-arm-kernel@lists.infradead.org
 -W:    http://hackndev.com
 -S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/palmtreo.h
 -F:    arch/arm/mach-pxa/palmtreo.c
 -
  ARM/PALMZ72 SUPPORT
  M:    Sergey Lapin <slapin@ossfans.org>
  L:    linux-arm-kernel@lists.infradead.org
@@@ -1829,6 -1802,17 +1829,6 @@@ L:     linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/platform/s5p-g2d/
  
 -ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -M:    Kamil Debski <kamil@wypas.org>
 -M:    Jeongtae Park <jtp.park@samsung.com>
 -M:    Andrzej Hajda <a.hajda@samsung.com>
 -L:    linux-arm-kernel@lists.infradead.org
 -L:    linux-media@vger.kernel.org
 -S:    Maintained
 -F:    arch/arm/plat-samsung/s5p-dev-mfc.c
 -F:    drivers/media/platform/s5p-mfc/
 -
  ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@@ -1845,17 -1829,6 +1845,17 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/platform/s5p-jpeg/
  
 +ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +M:    Kamil Debski <kamil@wypas.org>
 +M:    Jeongtae Park <jtp.park@samsung.com>
 +M:    Andrzej Hajda <a.hajda@samsung.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/plat-samsung/s5p-dev-mfc.c
 +F:    drivers/media/platform/s5p-mfc/
 +
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Simon Horman <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
@@@ -1949,48 -1922,26 +1949,48 @@@ M:   "Mark F. Brown" <mark.brown314@gmail
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 +M:    Santosh Shilimkar <ssantosh@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/memory/*emif*
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 +M:    Santosh Shilimkar <ssantosh@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-keystone/
 +F:    arch/arm/boot/dts/keystone-*
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
 +M:    Santosh Shilimkar <ssantosh@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/clk/keystone/
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 +M:    Santosh Shilimkar <ssantosh@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/clocksource/timer-keystone.c
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
 +M:    Santosh Shilimkar <ssantosh@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/power/reset/keystone-reset.c
 +
  ARM/THECUS N2100 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/NUVOTON W90X900 ARM ARCHITECTURE
 -M:    Wan ZongShun <mcuos.com@gmail.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.mcuos.com
 +ARM/TOSA MACHINE SUPPORT
 +M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 +M:    Dirk Opfer <dirk@opfer-online.de>
  S:    Maintained
 -F:    arch/arm/mach-w90x900/
 -F:    drivers/input/keyboard/w90p910_keypad.c
 -F:    drivers/input/touchscreen/w90p910_ts.c
 -F:    drivers/watchdog/nuc900_wdt.c
 -F:    drivers/net/ethernet/nuvoton/w90p910_ether.c
 -F:    drivers/mtd/nand/nuc900_nand.c
 -F:    drivers/rtc/rtc-nuc900.c
 -F:    drivers/spi/spi-nuc900.c
 -F:    drivers/usb/host/ehci-w90x900.c
 -F:    drivers/video/fbdev/nuc900fb.c
  
  ARM/U300 MACHINE SUPPORT
  M:    Linus Walleij <linus.walleij@linaro.org>
@@@ -2020,7 -1971,6 +2020,7 @@@ F:      arch/arm64/boot/dts/socionext
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
  F:    drivers/i2c/busses/i2c-uniphier*
 +F:    drivers/irqchip/irq-uniphier-aidet.c
  F:    drivers/pinctrl/uniphier/
  F:    drivers/reset/reset-uniphier.c
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -2107,38 -2057,17 +2107,38 @@@ F:   arch/arm/mach-pxa/include/mach/z2.
  ARM/ZTE ARCHITECTURE
  M:    Jun Nie <jun.nie@linaro.org>
  M:    Baoyou Xie <baoyou.xie@linaro.org>
 +M:    Shawn Guo <shawnguo@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    arch/arm/boot/dts/zx2967*
  F:    arch/arm/mach-zx/
 +F:    arch/arm64/boot/dts/zte/
  F:    drivers/clk/zte/
 +F:    drivers/dma/zx_dma.c
 +F:    drivers/gpio/gpio-zx.c
 +F:    drivers/i2c/busses/i2c-zx2967.c
 +F:    drivers/mmc/host/dw_mmc-zx.*
 +F:    drivers/pinctrl/zte/
  F:    drivers/reset/reset-zx2967.c
  F:    drivers/soc/zte/
 +F:    drivers/thermal/zx2967_thermal.c
 +F:    drivers/watchdog/zx2967_wdt.c
  F:    Documentation/devicetree/bindings/arm/zte.txt
 -F:    Documentation/devicetree/bindings/clock/zx296702-clk.txt
 +F:    Documentation/devicetree/bindings/clock/zx2967*.txt
 +F:    Documentation/devicetree/bindings/dma/zxdma.txt
 +F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
 +F:    Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 +F:    Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
  F:    Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
  F:    Documentation/devicetree/bindings/soc/zte/
 -F:    include/dt-bindings/soc/zx*.h
 +F:    Documentation/devicetree/bindings/sound/zte,*.txt
 +F:    Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
 +F:    Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
 +F:    include/dt-bindings/clock/zx2967*.h
 +F:    include/dt-bindings/soc/zte,*.h
 +F:    sound/soc/codecs/zx_aud96p22.c
 +F:    sound/soc/zte/
  
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <michal.simek@xilinx.com>
@@@ -2157,6 -2086,16 +2157,6 @@@ F:     drivers/i2c/busses/i2c-cadence.
  F:    drivers/mmc/host/sdhci-of-arasan.c
  F:    drivers/edac/synopsys_edac.c
  
 -ARM SMMU DRIVERS
 -M:    Will Deacon <will.deacon@arm.com>
 -R:    Robin Murphy <robin.murphy@arm.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    drivers/iommu/arm-smmu.c
 -F:    drivers/iommu/arm-smmu-v3.c
 -F:    drivers/iommu/io-pgtable-arm.c
 -F:    drivers/iommu/io-pgtable-arm-v7s.c
 -
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <catalin.marinas@arm.com>
  M:    Will Deacon <will.deacon@arm.com>
@@@ -2166,12 -2105,6 +2166,12 @@@ S:    Maintaine
  F:    arch/arm64/
  F:    Documentation/arm64/
  
 +AS3645A LED FLASH CONTROLLER DRIVER
 +M:    Sakari Ailus <sakari.ailus@iki.fi>
 +L:    linux-leds@vger.kernel.org
 +S:    Maintained
 +F:    drivers/leds/leds-as3645a.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -2274,10 -2207,21 +2274,10 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
 -WILOCITY WIL6210 WIRELESS DRIVER
 -M:    Maya Erez <qca_merez@qca.qualcomm.com>
 -L:    linux-wireless@vger.kernel.org
 -L:    wil6210@qca.qualcomm.com
 -S:    Supported
 -W:    http://wireless.kernel.org/en/users/Drivers/wil6210
 -F:    drivers/net/wireless/ath/wil6210/
 -F:    include/uapi/linux/wil6210_uapi.h
 -
 -CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 -M:    Christian Lamparter <chunkeey@googlemail.com>
 -L:    linux-wireless@vger.kernel.org
 -W:    http://wireless.kernel.org/en/users/Drivers/carl9170
 +ATI_REMOTE2 DRIVER
 +M:    Ville Syrjala <syrjala@sci.fi>
  S:    Maintained
 -F:    drivers/net/wireless/ath/carl9170/
 +F:    drivers/input/misc/ati_remote2.c
  
  ATK0110 HWMON DRIVER
  M:    Luca Tettamanti <kronos.it@gmail.com>
@@@ -2285,6 -2229,11 +2285,6 @@@ L:     linux-hwmon@vger.kernel.or
  S:    Maintained
  F:    drivers/hwmon/asus_atk0110.c
  
 -ATI_REMOTE2 DRIVER
 -M:    Ville Syrjala <syrjala@sci.fi>
 -S:    Maintained
 -F:    drivers/input/misc/ati_remote2.c
 -
  ATLX ETHERNET DRIVERS
  M:    Jay Cliburn <jcliburn@gmail.com>
  M:    Chris Snook <chris.snook@gmail.com>
@@@ -2314,12 -2263,25 +2314,12 @@@ M:   Nicolas Ferre <nicolas.ferre@microch
  S:    Supported
  F:    drivers/power/reset/at91-sama5d2_shdwc.c
  
 -ATMEL SAMA5D2 ADC DRIVER
 -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@microchip.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/atmel
  
 -ATMEL XDMA DRIVER
 -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@microchip.com>
  L:    linux-i2c@vger.kernel.org
@@@ -2345,14 -2307,6 +2345,14 @@@ M:    Nicolas Ferre <nicolas.ferre@microch
  S:    Supported
  F:    drivers/net/ethernet/cadence/
  
 +ATMEL MAXTOUCH DRIVER
 +M:    Nick Dyer <nick@shmanahar.org>
 +T:    git git://github.com/ndyer/linux.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/atmel,maxtouch.txt
 +F:    drivers/input/touchscreen/atmel_mxt_ts.c
 +F:    include/linux/platform_data/atmel_mxt_ts.h
 +
  ATMEL NAND DRIVER
  M:    Wenyou Yang <wenyou.yang@atmel.com>
  M:    Josh Wu <rainyfeeling@outlook.com>
@@@ -2360,12 -2314,6 +2360,12 @@@ L:    linux-mtd@lists.infradead.or
  S:    Supported
  F:    drivers/mtd/nand/atmel/*
  
 +ATMEL SAMA5D2 ADC DRIVER
 +M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +F:    drivers/iio/adc/at91-sama5d2_adc.c
 +
  ATMEL SDMMC DRIVER
  M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-mmc@vger.kernel.org
@@@ -2405,12 -2353,13 +2405,12 @@@ W:   http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel/atmel*
  
 -ATMEL MAXTOUCH DRIVER
 -M:    Nick Dyer <nick@shmanahar.org>
 -T:    git git://github.com/ndyer/linux.git
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/input/atmel,maxtouch.txt
 -F:    drivers/input/touchscreen/atmel_mxt_ts.c
 -F:    include/linux/platform_data/atmel_mxt_ts.h
 +ATMEL XDMA DRIVER
 +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
  
  ATOMIC INFRASTRUCTURE
  M:    Will Deacon <will.deacon@arm.com>
@@@ -2440,10 -2389,9 +2440,10 @@@ AUDIT SUBSYSTE
  M:    Paul Moore <paul@paul-moore.com>
  M:    Eric Paris <eparis@redhat.com>
  L:    linux-audit@redhat.com (moderated for non-subscribers)
 -W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.infradead.org/users/pcmoore/audit
 -S:    Maintained
 +W:    https://github.com/linux-audit
 +W:    https://people.redhat.com/sgrubb/audit
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
 +S:    Supported
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
@@@ -2465,6 -2413,13 +2465,6 @@@ F:     include/uapi/linux/ax25.
  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)
@@@ -2473,13 -2428,6 +2473,13 @@@ F:    Documentation/devicetree/bindings/ar
  F:    arch/arm/boot/dts/at91-linea.dtsi
  F:    arch/arm/boot/dts/at91-tse850-3.dts
  
 +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>
@@@ -2533,7 -2481,7 +2533,7 @@@ Q:      https://patchwork.open-mesh.org/proj
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
  F:    Documentation/ABI/testing/sysfs-class-net-mesh
 -F:    Documentation/networking/batman-adv.txt
 +F:    Documentation/networking/batman-adv.rst
  F:    include/uapi/linux/batman_adv.h
  F:    net/batman-adv/
  
@@@ -2559,11 -2507,13 +2559,11 @@@ W:   https://linuxtv.or
  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
 +BECKHOFF CX5020 ETHERCAT MASTER DRIVER
 +M:    Dariusz Marcinkiewicz <reksio@newterm.pl>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/ec_bhf.c
  
  BEFS FILE SYSTEM
  M:    Luis de Bethencourt <luisbg@kernel.org>
@@@ -2573,13 -2523,11 +2573,13 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/befs.txt
  F:    fs/befs/
  
 -BECKHOFF CX5020 ETHERCAT MASTER DRIVER
 -M:    Dariusz Marcinkiewicz <reksio@newterm.pl>
 -L:    netdev@vger.kernel.org
 +BFQ I/O SCHEDULER
 +M:    Paolo Valente <paolo.valente@linaro.org>
 +M:    Jens Axboe <axboe@kernel.dk>
 +L:    linux-block@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/ethernet/ec_bhf.c
 +F:    block/bfq-*
 +F:    Documentation/block/bfq-iosched.txt
  
  BFS FILE SYSTEM
  M:    "Tigran A. Aivazian" <aivazian.tigran@gmail.com>
@@@ -2602,28 -2550,21 +2602,28 @@@ W:   http://blackfin.uclinux.or
  S:    Supported
  F:    drivers/net/ethernet/adi/
  
 -BLACKFIN RTC DRIVER
 +BLACKFIN MEDIA DRIVER
 +M:    Scott Jiang <scott.jiang.linux@gmail.com>
 +L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 +W:    http://blackfin.uclinux.org/
 +S:    Supported
 +F:    drivers/media/platform/blackfin/
 +F:    drivers/media/i2c/adv7183*
 +F:    drivers/media/i2c/vs6624*
 +
 +BLACKFIN RTC DRIVER
  L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/rtc/rtc-bfin.c
  
  BLACKFIN SDH DRIVER
 -M:    Sonic Zhang <sonic.zhang@analog.com>
  L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/mmc/host/bfin_sdh.c
  
  BLACKFIN SERIAL DRIVER
 -M:    Sonic Zhang <sonic.zhang@analog.com>
  L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -2635,6 -2576,22 +2635,6 @@@ W:     http://blackfin.uclinux.or
  S:    Supported
  F:    drivers/watchdog/bfin_wdt.c
  
 -BLACKFIN I2C TWI DRIVER
 -M:    Sonic Zhang <sonic.zhang@analog.com>
 -L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-bfin-twi.c
 -
 -BLACKFIN MEDIA DRIVER
 -M:    Scott Jiang <scott.jiang.linux@gmail.com>
 -L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Supported
 -F:    drivers/media/platform/blackfin/
 -F:    drivers/media/i2c/adv7183*
 -F:    drivers/media/i2c/vs6624*
 -
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <jansimon.moeller@gmx.de>
  S:    Maintained
@@@ -2649,6 -2606,14 +2649,6 @@@ F:     block
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
 -BFQ I/O SCHEDULER
 -M:    Paolo Valente <paolo.valente@linaro.org>
 -M:    Jens Axboe <axboe@kernel.dk>
 -L:    linux-block@vger.kernel.org
 -S:    Maintained
 -F:    block/bfq-*
 -F:    Documentation/block/bfq-iosched.txt
 -
  BLOCK2MTD DRIVER
  M:    Joern Engel <joern@lazybastard.org>
  L:    linux-mtd@lists.infradead.org
@@@ -2678,6 -2643,21 +2678,6 @@@ S:     Maintaine
  F:    net/bluetooth/
  F:    include/net/bluetooth/
  
 -DMA MAPPING HELPERS
 -M:    Christoph Hellwig <hch@lst.de>
 -M:    Marek Szyprowski <m.szyprowski@samsung.com>
 -R:    Robin Murphy <robin.murphy@arm.com>
 -L:    linux-kernel@vger.kernel.org
 -T:    git git://git.infradead.org/users/hch/dma-mapping.git
 -W:    http://git.infradead.org/users/hch/dma-mapping.git
 -S:    Supported
 -F:    lib/dma-debug.c
 -F:    lib/dma-noop.c
 -F:    lib/dma-virt.c
 -F:    drivers/base/dma-mapping.c
 -F:    drivers/base/dma-coherent.c
 -F:    include/linux/dma-mapping.h
 -
  BONDING DRIVER
  M:    Jay Vosburgh <j.vosburgh@gmail.com>
  M:    Veaceslav Falico <vfalico@gmail.com>
@@@ -2725,6 -2705,35 +2725,6 @@@ S:     Supporte
  F:    drivers/net/dsa/b53/*
  F:    include/linux/platform_data/b53.h
  
 -BROADCOM GENET ETHERNET DRIVER
 -M:    Florian Fainelli <f.fainelli@gmail.com>
 -L:    netdev@vger.kernel.org
 -S:    Supported
 -F:    drivers/net/ethernet/broadcom/genet/
 -
 -BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <rasesh.mody@cavium.com>
 -M:    Harish Patil <harish.patil@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 -L:    netdev@vger.kernel.org
 -S:    Supported
 -F:    drivers/net/ethernet/broadcom/bnx2.*
 -F:    drivers/net/ethernet/broadcom/bnx2_*
 -
 -BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 -M:    Yuval Mintz <Yuval.Mintz@cavium.com>
 -M:    Ariel Elior <ariel.elior@cavium.com>
 -M:    everest-linux-l2@cavium.com
 -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>
@@@ -2803,13 -2812,6 +2803,13 @@@ F:    arch/arm/boot/dts/bcm7*.dts
  F:    drivers/bus/brcmstb_gisb.c
  N:    brcmstb
  
 +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 BMIPS MIPS ARCHITECTURE
  M:    Kevin Cernekee <cernekee@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
@@@ -2826,40 -2828,20 +2826,40 @@@ 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 BNX2 GIGABIT ETHERNET DRIVER
 +M:    Rasesh Mody <rasesh.mody@cavium.com>
 +M:    Harish Patil <harish.patil@cavium.com>
 +M:    Dept-GELinuxNICDev@cavium.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/broadcom/bnx2.*
 +F:    drivers/net/ethernet/broadcom/bnx2_*
  
 -BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Siva Reddy Kallam <siva.kallam@broadcom.com>
 -M:    Prashant Sreedharan <prashant@broadcom.com>
 -M:    Michael Chan <mchan@broadcom.com>
 +BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 +M:    QLogic-Storage-Upstream@qlogic.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/bnx2fc/
 +
 +BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 +M:    QLogic-Storage-Upstream@qlogic.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/bnx2i/
 +
 +BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 +M:    Yuval Mintz <Yuval.Mintz@cavium.com>
 +M:    Ariel Elior <ariel.elior@cavium.com>
 +M:    everest-linux-l2@cavium.com
  L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/net/ethernet/broadcom/tg3.*
 +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 BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Arend van Spriel <arend.vanspriel@broadcom.com>
@@@ -2873,18 -2855,17 +2873,18 @@@ L:   brcm80211-dev-list@cypress.co
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
 -BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 -M:    QLogic-Storage-Upstream@qlogic.com
 -L:    linux-scsi@vger.kernel.org
 +BROADCOM BRCMSTB GPIO DRIVER
 +M:    Gregory Fong <gregory.0xf0@gmail.com>
 +L:    bcm-kernel-feedback-list@broadcom.com
  S:    Supported
 -F:    drivers/scsi/bnx2fc/
 +F:    drivers/gpio/gpio-brcmstb.c
 +F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
  
 -BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 -M:    QLogic-Storage-Upstream@qlogic.com
 -L:    linux-scsi@vger.kernel.org
 +BROADCOM GENET ETHERNET DRIVER
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/scsi/bnx2i/
 +F:    drivers/net/ethernet/broadcom/genet/
  
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <rjui@broadcom.com>
@@@ -2911,6 -2892,13 +2911,6 @@@ F:     arch/arm64/boot/dts/broadcom/ns2
  F:    drivers/clk/bcm/clk-ns*
  F:    drivers/pinctrl/bcm/pinctrl-ns*
  
 -BROADCOM BRCMSTB GPIO DRIVER
 -M:    Gregory Fong <gregory.0xf0@gmail.com>
 -L:    bcm-kernel-feedback-list@broadcom.com
 -S:    Supported
 -F:    drivers/gpio/gpio-brcmstb.c
 -F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 -
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
  L:    bcm-kernel-feedback-list@broadcom.com
@@@ -2918,29 -2906,19 +2918,29 @@@ S:   Supporte
  F:    drivers/gpio/gpio-bcm-kona.c
  F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
  
 +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
 +
  BROADCOM NVRAM DRIVER
  M:    Rafał Miłecki <zajec5@gmail.com>
  L:    linux-mips@linux-mips.org
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
 -BROADCOM STB NAND FLASH DRIVER
 -M:    Brian Norris <computersforpeace@gmail.com>
 -M:    Kamal Dasu <kdasu.kdev@gmail.com>
 -L:    linux-mtd@lists.infradead.org
 -L:    bcm-kernel-feedback-list@broadcom.com
 +BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 +M:    Rafał Miłecki <zajec5@gmail.com>
 +L:    linux-wireless@vger.kernel.org
  S:    Maintained
 -F:    drivers/mtd/nand/brcmnand/
 +F:    drivers/bcma/
 +F:    include/linux/bcma/
  
  BROADCOM STB AVS CPUFREQ DRIVER
  M:    Markus Mayer <mmayer@broadcom.com>
@@@ -2950,13 -2928,12 +2950,13 @@@ S:   Maintaine
  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
 +BROADCOM STB NAND FLASH DRIVER
 +M:    Brian Norris <computersforpeace@gmail.com>
 +M:    Kamal Dasu <kdasu.kdev@gmail.com>
 +L:    linux-mtd@lists.infradead.org
 +L:    bcm-kernel-feedback-list@broadcom.com
  S:    Maintained
 -F:    drivers/bcma/
 -F:    include/linux/bcma/
 +F:    drivers/mtd/nand/brcmnand/
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
@@@ -2964,13 -2941,16 +2964,13 @@@ L:   netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  
 -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
 +BROADCOM TG3 GIGABIT ETHERNET DRIVER
 +M:    Siva Reddy Kallam <siva.kallam@broadcom.com>
 +M:    Prashant Sreedharan <prashant@broadcom.com>
 +M:    Michael Chan <mchan@broadcom.com>
 +L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/infiniband/hw/bnxt_re/
 -F:    include/uapi/rdma/bnxt_re-abi.h
 +F:    drivers/net/ethernet/broadcom/tg3.*
  
  BROCADE BFA FC SCSI DRIVER
  M:    Anil Gurumurthy <anil.gurumurthy@qlogic.com>
@@@ -3033,15 -3013,6 +3033,15 @@@ S:    Odd fixe
  F:    Documentation/media/v4l-drivers/bttv*
  F:    drivers/media/pci/bt8xx/bttv*
  
 +BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
 +M:    Chanwoo Choi <cw00.choi@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 +S:    Maintained
 +F:    drivers/devfreq/exynos-bus.c
 +F:    Documentation/devicetree/bindings/devfreq/exynos-bus.txt
 +
  BUSLOGIC SCSI DRIVER
  M:    Khalid Aziz <khalid@gonehiking.org>
  L:    linux-scsi@vger.kernel.org
@@@ -3116,21 -3087,6 +3116,21 @@@ F:    arch/x86/kernel/tce_64.
  F:    arch/x86/include/asm/calgary.h
  F:    arch/x86/include/asm/tce.h
  
 +CAN NETWORK DRIVERS
 +M:    Wolfgang Grandegger <wg@grandegger.com>
 +M:    Marc Kleine-Budde <mkl@pengutronix.de>
 +L:    linux-can@vger.kernel.org
 +W:    https://github.com/linux-can
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/
 +F:    drivers/net/can/
 +F:    include/linux/can/dev.h
 +F:    include/linux/can/platform/
 +F:    include/uapi/linux/can/error.h
 +F:    include/uapi/linux/can/netlink.h
 +
  CAN NETWORK LAYER
  M:    Oliver Hartkopp <socketcan@hartkopp.net>
  M:    Marc Kleine-Budde <mkl@pengutronix.de>
@@@ -3147,6 -3103,21 +3147,6 @@@ F:     include/uapi/linux/can/bcm.
  F:    include/uapi/linux/can/raw.h
  F:    include/uapi/linux/can/gw.h
  
 -CAN NETWORK DRIVERS
 -M:    Wolfgang Grandegger <wg@grandegger.com>
 -M:    Marc Kleine-Budde <mkl@pengutronix.de>
 -L:    linux-can@vger.kernel.org
 -W:    https://github.com/linux-can
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/net/can/
 -F:    drivers/net/can/
 -F:    include/linux/can/dev.h
 -F:    include/linux/can/platform/
 -F:    include/uapi/linux/can/error.h
 -F:    include/uapi/linux/can/netlink.h
 -
  CAPABILITIES
  M:    Serge Hallyn <serge@hallyn.com>
  L:    linux-security-module@vger.kernel.org
@@@ -3161,12 -3132,12 +3161,12 @@@ M:   Kevin Tsai <ktsai@capellamicro.com
  S:    Maintained
  F:    drivers/iio/light/cm*
  
 -CAVIUM THUNDERX2 ARM64 SOC
 -M:    Jayachandran C <jnair@caviumnetworks.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 +M:    Christian Lamparter <chunkeey@googlemail.com>
 +L:    linux-wireless@vger.kernel.org
 +W:    http://wireless.kernel.org/en/users/Drivers/carl9170
  S:    Maintained
 -F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
 -F:    Documentation/devicetree/bindings/arm/cavium-thunder2.txt
 +F:    drivers/net/wireless/ath/carl9170/
  
  CAVIUM I2C DRIVER
  M:    Jan Glauber <jglauber@cavium.com>
@@@ -3176,16 -3147,6 +3176,16 @@@ S:    Supporte
  F:    drivers/i2c/busses/i2c-octeon*
  F:    drivers/i2c/busses/i2c-thunderx*
  
 +CAVIUM LIQUIDIO NETWORK DRIVER
 +M:    Derek Chickles <derek.chickles@caviumnetworks.com>
 +M:    Satanand Burla <satananda.burla@caviumnetworks.com>
 +M:    Felix Manlunas <felix.manlunas@caviumnetworks.com>
 +M:    Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
 +L:    netdev@vger.kernel.org
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/net/ethernet/cavium/liquidio/
 +
  CAVIUM MMC DRIVER
  M:    Jan Glauber <jglauber@cavium.com>
  M:    David Daney <david.daney@cavium.com>
@@@ -3194,6 -3155,16 +3194,6 @@@ W:     http://www.cavium.co
  S:    Supported
  F:    drivers/mmc/host/cavium*
  
 -CAVIUM LIQUIDIO NETWORK DRIVER
 -M:     Derek Chickles <derek.chickles@caviumnetworks.com>
 -M:     Satanand Burla <satananda.burla@caviumnetworks.com>
 -M:     Felix Manlunas <felix.manlunas@caviumnetworks.com>
 -M:     Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
 -L:     netdev@vger.kernel.org
 -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
@@@ -3201,18 -3172,10 +3201,18 @@@ W:   http://www.cavium.co
  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
 -S:    Maintained
 +CAVIUM THUNDERX2 ARM64 SOC
 +M:    Robert Richter <rrichter@cavium.com>
 +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/thunder2-99xx*
 +F:    Documentation/devicetree/bindings/arm/cavium-thunder2.txt
 +
 +CC2520 IEEE-802.15.4 RADIO DRIVER
 +M:    Varka Bhadram <varkabhadram@gmail.com>
 +L:    linux-wpan@vger.kernel.org
 +S:    Maintained
  F:    drivers/net/ieee802154/cc2520.c
  F:    include/linux/spi/cc2520.h
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
@@@ -3297,6 -3260,12 +3297,6 @@@ 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
@@@ -3368,34 -3337,6 +3368,34 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
  F:    drivers/platform/chrome/
  
 +CIRRUS LOGIC AUDIO CODEC DRIVERS
 +M:    Brian Austin <brian.austin@cirrus.com>
 +M:    Paul Handrigan <Paul.Handrigan@cirrus.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/codecs/cs*
 +
 +CIRRUS LOGIC EP93XX ETHERNET DRIVER
 +M:    Hartley Sweeten <hsweeten@visionengravers.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
 +
 +CISCO FCOE HBA DRIVER
 +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:    Karan Tilak Kumar <kartilak@cisco.com>
 +M:    Sesidhar Baddela <sebaddel@cisco.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/snic/
 +
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Govindarajulu Varadarajan <_govind@gmx.com>
@@@ -3409,6 -3350,19 +3409,6 @@@ M:     Dave Goodell <dgoodell@cisco.com
  S:    Supported
  F:    drivers/infiniband/hw/usnic/
  
 -CIRRUS LOGIC EP93XX ETHERNET DRIVER
 -M:    Hartley Sweeten <hsweeten@visionengravers.com>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
 -
 -CIRRUS LOGIC AUDIO CODEC DRIVERS
 -M:    Brian Austin <brian.austin@cirrus.com>
 -M:    Paul Handrigan <Paul.Handrigan@cirrus.com>
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    sound/soc/codecs/cs*
 -
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    linux-kernel@vger.kernel.org
@@@ -3430,6 -3384,21 +3430,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/clocksource
  
 -CISCO FCOE HBA DRIVER
 -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:    Karan Tilak Kumar <kartilak@cisco.com>
 -M:    Sesidhar Baddela <sebaddel@cisco.com>
 -L:    linux-scsi@vger.kernel.org
 -S:    Supported
 -F:    drivers/scsi/snic/
 -
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
  M:    Daniel Oliveira Nascimento <don@syst.com.br>
@@@ -3505,17 -3474,17 +3505,17 @@@ L:   linux-pci@vger.kernel.or
  S:    Maintained
  F:    drivers/pci/hotplug/cpci_hotplug*
  
 -COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
 +COMPACTPCI HOTPLUG GENERIC DRIVER
  M:    Scott Murray <scott@spiteful.org>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    drivers/pci/hotplug/cpcihp_zt5550.*
 +F:    drivers/pci/hotplug/cpcihp_generic.c
  
 -COMPACTPCI HOTPLUG GENERIC DRIVER
 +COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
  M:    Scott Murray <scott@spiteful.org>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    drivers/pci/hotplug/cpcihp_generic.c
 +F:    drivers/pci/hotplug/cpcihp_zt5550.*
  
  COMPAL LAPTOP SUPPORT
  M:    Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
@@@ -3618,18 -3587,6 +3618,18 @@@ F:    drivers/cpufreq/arm_big_little.
  F:    drivers/cpufreq/arm_big_little.c
  F:    drivers/cpufreq/arm_big_little_dt.c
  
 +CPU POWER MONITORING SUBSYSTEM
 +M:    Thomas Renninger <trenn@suse.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    tools/power/cpupower/
 +
 +CPUID/MSR DRIVER
 +M:    "H. Peter Anvin" <hpa@zytor.com>
 +S:    Maintained
 +F:    arch/x86/kernel/cpuid.c
 +F:    arch/x86/kernel/msr.c
 +
  CPUIDLE DRIVER - ARM BIG LITTLE
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
@@@ -3659,6 -3616,18 +3659,6 @@@ B:     https://bugzilla.kernel.or
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
 -CPUID/MSR DRIVER
 -M:    "H. Peter Anvin" <hpa@zytor.com>
 -S:    Maintained
 -F:    arch/x86/kernel/cpuid.c
 -F:    arch/x86/kernel/msr.c
 -
 -CPU POWER MONITORING SUBSYSTEM
 -M:    Thomas Renninger <trenn@suse.com>
 -L:    linux-pm@vger.kernel.org
 -S:    Maintained
 -F:    tools/power/cpupower/
 -
  CRAMFS FILESYSTEM
  W:    http://sourceforge.net/projects/cramfs/
  S:    Orphan / Obsolete
@@@ -3788,13 -3757,6 +3788,13 @@@ S:    Supporte
  F:    drivers/infiniband/hw/cxgb3/
  F:    include/uapi/rdma/cxgb3-abi.h
  
 +CXGB4 CRYPTO DRIVER (chcr)
 +M:    Harsh Jain <harsh@chelsio.com>
 +L:    linux-crypto@vger.kernel.org
 +W:    http://www.chelsio.com
 +S:    Supported
 +F:    drivers/crypto/chelsio
 +
  CXGB4 ETHERNET DRIVER (CXGB4)
  M:    Ganesh Goudar <ganeshgr@chelsio.com>
  L:    netdev@vger.kernel.org
@@@ -3817,6 -3779,13 +3817,6 @@@ S:     Supporte
  F:    drivers/infiniband/hw/cxgb4/
  F:    include/uapi/rdma/cxgb4-abi.h
  
 -CXGB4 CRYPTO DRIVER (chcr)
 -M:    Harsh Jain <harsh@chelsio.com>
 -L:    linux-crypto@vger.kernel.org
 -W:    http://www.chelsio.com
 -S:    Supported
 -F:    drivers/crypto/chelsio
 -
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
  M:    Casey Leedom <leedom@chelsio.com>
  L:    netdev@vger.kernel.org
@@@ -3846,6 -3815,14 +3846,6 @@@ F:     drivers/scsi/cxlflash
  F:    include/uapi/scsi/cxlflash_ioctls.h
  F:    Documentation/powerpc/cxlflash.txt
  
 -STMMAC ETHERNET DRIVER
 -M:    Giuseppe Cavallaro <peppe.cavallaro@st.com>
 -M:    Alexandre Torgue <alexandre.torgue@st.com>
 -L:    netdev@vger.kernel.org
 -W:    http://www.stlinux.com
 -S:    Supported
 -F:    drivers/net/ethernet/stmicro/stmmac/
 -
  CYBERPRO FB DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -3969,15 -3946,15 +3969,15 @@@ L:   platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/dell-laptop.c
  
 -DELL LAPTOP RBTN DRIVER
 +DELL LAPTOP FREEFALL DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
 -F:    drivers/platform/x86/dell-rbtn.*
 +F:    drivers/platform/x86/dell-smo8800.c
  
 -DELL LAPTOP FREEFALL DRIVER
 +DELL LAPTOP RBTN DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
 -F:    drivers/platform/x86/dell-smo8800.c
 +F:    drivers/platform/x86/dell-rbtn.*
  
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
@@@ -3997,14 -3974,6 +3997,14 @@@ M:    Pali Rohár <pali.rohar@gmail.com
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 +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
 +
  DENALI NAND DRIVER
  M:    Masahiro Yamada <yamada.masahiro@socionext.com>
  L:    linux-mtd@lists.infradead.org
@@@ -4059,6 -4028,15 +4059,6 @@@ F:     drivers/devfreq/devfreq-event.
  F:    include/linux/devfreq-event.h
  F:    Documentation/devicetree/bindings/devfreq/event/
  
 -BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
 -M:    Chanwoo Choi <cw00.choi@samsung.com>
 -L:    linux-pm@vger.kernel.org
 -L:    linux-samsung-soc@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 -S:    Maintained
 -F:    drivers/devfreq/exynos-bus.c
 -F:    Documentation/devicetree/bindings/devfreq/exynos-bus.txt
 -
  DEVICE NUMBER REGISTRY
  M:    Torben Mathiasen <device@lanana.org>
  W:    http://lanana.org/docs/device-list/index.html
@@@ -4156,9 -4134,7 +4156,9 @@@ F:      include/linux/dax.
  F:    include/trace/events/fs_dax.h
  
  DIRECTORY NOTIFICATION (DNOTIFY)
 -M:    Eric Paris <eparis@parisplace.org>
 +M:    Jan Kara <jack@suse.cz>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/dnotify.txt
  F:    fs/notify/dnotify/
@@@ -4210,6 -4186,20 +4210,6 @@@ F:     include/linux/*fence.
  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>
 -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_*
 -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://anongit.freedesktop.org/drm/drm-misc
 -
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <vinod.koul@intel.com>
  L:    dmaengine@vger.kernel.org
@@@ -4221,21 -4211,6 +4221,21 @@@ F:    Documentation/devicetree/bindings/dm
  F:    Documentation/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  
 +DMA MAPPING HELPERS
 +M:    Christoph Hellwig <hch@lst.de>
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +R:    Robin Murphy <robin.murphy@arm.com>
 +L:    iommu@lists.linux-foundation.org
 +T:    git git://git.infradead.org/users/hch/dma-mapping.git
 +W:    http://git.infradead.org/users/hch/dma-mapping.git
 +S:    Supported
 +F:    lib/dma-debug.c
 +F:    lib/dma-noop.c
 +F:    lib/dma-virt.c
 +F:    drivers/base/dma-mapping.c
 +F:    drivers/base/dma-coherent.c
 +F:    include/linux/dma-mapping.h
 +
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -4266,13 -4241,6 +4266,13 @@@ X:    Documentation/sp
  X:    Documentation/media
  T:    git git://git.lwn.net/linux.git docs-next
  
 +DONGWOON DW9714 LENS VOICE COIL DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/dw9714.c
 +
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <jrv@vanzandt.mv.com>
  L:    blinux-list@redhat.com
@@@ -4324,13 -4292,36 +4324,13 @@@ F:   include/linux/debugfs.
  F:    include/linux/kobj*
  F:    lib/kobj*
  
 -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/
 -F:    Documentation/devicetree/bindings/display/
 -F:    Documentation/devicetree/bindings/gpu/
 -F:    Documentation/devicetree/bindings/video/
 -F:    Documentation/gpu/
 -F:    include/drm/
 -F:    include/uapi/drm/
 -F:    include/linux/vga*
 -
 -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
 +DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 +M:    Kevin Hilman <khilman@kernel.org>
 +M:    Nishanth Menon <nm@ti.com>
  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*
 -F:    include/linux/vga*
 +F:    drivers/power/avs/
 +F:    include/linux/power/smartreflex.h
 +L:    linux-pm@vger.kernel.org
  
  DRM DRIVER FOR ARM PL111 CLCD
  M:    Eric Anholt <eric@anholt.net>
@@@ -4343,6 -4334,14 +4343,6 @@@ 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>
 -M:    Andrzej Hajda <a.hajda@samsung.com>
 -R:    Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 -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>
  L:    virtualization@lists.linux-foundation.org
@@@ -4350,142 -4349,68 +4350,142 @@@ T: git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/bochs/
  
 -DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 +DRM DRIVER FOR INTEL I810 VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/i810/
 +F:    include/uapi/drm/i810_drm.h
 +
 +DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/mga/
 +F:    include/uapi/drm/mga_drm.h
 +
 +DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
  M:    Dave Airlie <airlied@redhat.com>
 -M:    Gerd Hoffmann <kraxel@redhat.com>
 -L:    virtualization@lists.linux-foundation.org
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -S:    Obsolete
 -W:    https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
 -F:    drivers/gpu/drm/cirrus/
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/mgag200/
  
 -RADEON and AMDGPU DRM DRIVERS
 -M:    Alex Deucher <alexander.deucher@amd.com>
 -M:    Christian König <christian.koenig@amd.com>
 -L:    amd-gfx@lists.freedesktop.org
 -T:    git git://people.freedesktop.org/~agd5f/linux
 -S:    Supported
 -F:    drivers/gpu/drm/radeon/
 -F:    include/uapi/drm/radeon_drm.h
 -F:    drivers/gpu/drm/amd/
 -F:    include/uapi/drm/amdgpu_drm.h
 +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 PANEL DRIVERS
 -M:    Thierry Reding <thierry.reding@gmail.com>
 +DRM DRIVER FOR MSM ADRENO GPU
 +M:    Rob Clark <robdclark@gmail.com>
 +L:    linux-arm-msm@vger.kernel.org
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://anongit.freedesktop.org/tegra/linux.git
 +L:    freedreno@lists.freedesktop.org
 +T:    git git://people.freedesktop.org/~robclark/linux
  S:    Maintained
 -F:    drivers/gpu/drm/drm_panel.c
 -F:    drivers/gpu/drm/panel/
 -F:    include/drm/drm_panel.h
 -F:    Documentation/devicetree/bindings/display/panel/
 +F:    drivers/gpu/drm/msm/
 +F:    include/uapi/drm/msm_drm.h
 +F:    Documentation/devicetree/bindings/display/msm/
  
 -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
 -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
 +DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 +M:    Ben Skeggs <bskeggs@redhat.com>
 +L:    dri-devel@lists.freedesktop.org
 +L:    nouveau@lists.freedesktop.org
 +T:    git git://github.com/skeggsb/linux
  S:    Supported
 -F:    drivers/gpu/drm/i915/
 -F:    include/drm/i915*
 -F:    include/uapi/drm/i915_drm.h
 -F:    Documentation/gpu/i915.rst
 +F:    drivers/gpu/drm/nouveau/
 +F:    include/uapi/drm/nouveau_drm.h
  
 -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 DRIVER FOR QEMU'S CIRRUS DEVICE
 +M:    Dave Airlie <airlied@redhat.com>
 +M:    Gerd Hoffmann <kraxel@redhat.com>
 +L:    virtualization@lists.linux-foundation.org
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Obsolete
 +W:    https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
 +F:    drivers/gpu/drm/cirrus/
  
 -DRM DRIVERS FOR ATMEL HLCDC
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +DRM DRIVER FOR QXL VIRTUAL GPU
 +M:    Dave Airlie <airlied@redhat.com>
 +M:    Gerd Hoffmann <kraxel@redhat.com>
 +L:    virtualization@lists.linux-foundation.org
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/qxl/
 +F:    include/uapi/drm/qxl_drm.h
 +
 +DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/repaper.c
 +F:    Documentation/devicetree/bindings/display/repaper.txt
 +
 +DRM DRIVER FOR RAGE 128 VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/r128/
 +F:    include/uapi/drm/r128_drm.h
 +
 +DRM DRIVER FOR SAVAGE VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/savage/
 +F:    include/uapi/drm/savage_drm.h
 +
 +DRM DRIVER FOR SIS VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/sis/
 +F:    include/uapi/drm/sis_drm.h
 +
 +DRM DRIVER FOR SITRONIX ST7586 PANELS
 +M:    David Lechner <david@lechnology.com>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/st7586.c
 +F:    Documentation/devicetree/bindings/display/st7586.txt
 +
 +DRM DRIVER FOR TDFX VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/tdfx/
 +
 +DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 +M:    Dave Airlie <airlied@redhat.com>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/udl/
 +
 +DRM DRIVER FOR VMWARE VIRTUAL GPU
 +M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
 +M:    Sinclair Yeh <syeh@vmware.com>
 +M:    Thomas Hellstrom <thellstrom@vmware.com>
  L:    dri-devel@lists.freedesktop.org
 +T:    git git://people.freedesktop.org/~syeh/repos_linux
 +T:    git git://people.freedesktop.org/~thomash/linux
  S:    Supported
 -F:    drivers/gpu/drm/atmel-hlcdc/
 -F:    Documentation/devicetree/bindings/drm/atmel/
 +F:    drivers/gpu/drm/vmwgfx/
 +F:    include/uapi/drm/vmwgfx_drm.h
 +
 +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/
 +F:    Documentation/devicetree/bindings/display/
 +F:    Documentation/devicetree/bindings/gpu/
 +F:    Documentation/devicetree/bindings/video/
 +F:    Documentation/gpu/
 +F:    include/drm/
 +F:    include/uapi/drm/
 +F:    include/linux/vga*
 +
 +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*
 +F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard  <maxime.ripard@free-electrons.com>
@@@ -4507,22 -4432,6 +4507,22 @@@ F:    Documentation/devicetree/bindings/di
  F:    Documentation/gpu/meson.rst
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +DRM DRIVERS FOR ATMEL HLCDC
 +M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Supported
 +F:    drivers/gpu/drm/atmel-hlcdc/
 +F:    Documentation/devicetree/bindings/drm/atmel/
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
 +DRM DRIVERS FOR BRIDGE CHIPS
 +M:    Archit Taneja <architt@codeaurora.org>
 +M:    Andrzej Hajda <a.hajda@samsung.com>
 +R:    Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/bridge/
 +
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <inki.dae@samsung.com>
  M:    Joonyoung Shim <jy0922.shim@samsung.com>
@@@ -4571,6 -4480,11 +4571,6 @@@ S:     Maintaine
  F:    drivers/gpu/drm/hisilicon/
  F:    Documentation/devicetree/bindings/display/hisilicon/
  
 -DRM DRIVER FOR INTEL I810 VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/i810/
 -F:    include/uapi/drm/i810_drm.h
 -
  DRM DRIVERS FOR MEDIATEK
  M:    CK Hu <ck.hu@mediatek.com>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -4579,6 -4493,32 +4579,6 @@@ S:     Supporte
  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
 -L:    dri-devel@lists.freedesktop.org
 -L:    freedreno@lists.freedesktop.org
 -T:    git git://people.freedesktop.org/~robclark/linux
 -S:    Maintained
 -F:    drivers/gpu/drm/msm/
 -F:    include/uapi/drm/msm_drm.h
 -F:    Documentation/devicetree/bindings/display/msm/
 -
 -DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 -M:    Ben Skeggs <bskeggs@redhat.com>
 -L:    dri-devel@lists.freedesktop.org
 -L:    nouveau@lists.freedesktop.org
 -T:    git git://github.com/skeggsb/linux
 -S:    Supported
 -F:    drivers/gpu/drm/nouveau/
 -F:    include/uapi/drm/nouveau_drm.h
 -
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -4591,6 -4531,21 +4591,6 @@@ F:     include/linux/host1x.
  F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
  
 -DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/mga/
 -F:    include/uapi/drm/mga_drm.h
 -
 -DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 -M:    Dave Airlie <airlied@redhat.com>
 -S:    Odd Fixes
 -F:    drivers/gpu/drm/mgag200/
 -
 -DRM DRIVER FOR RAGE 128 VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/r128/
 -F:    include/uapi/drm/r128_drm.h
 -
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -4603,6 -4558,15 +4603,6 @@@ F:     include/linux/platform_data/shmob_dr
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  
 -DRM DRIVER FOR QXL VIRTUAL GPU
 -M:    Dave Airlie <airlied@redhat.com>
 -M:    Gerd Hoffmann <kraxel@redhat.com>
 -L:    virtualization@lists.linux-foundation.org
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -S:    Maintained
 -F:    drivers/gpu/drm/qxl/
 -F:    include/uapi/drm/qxl_drm.h
 -
  DRM DRIVERS FOR ROCKCHIP
  M:    Mark Yao <mark.yao@rock-chips.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -4611,6 -4575,16 +4611,6 @@@ F:     drivers/gpu/drm/rockchip
  F:    Documentation/devicetree/bindings/display/rockchip/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 -DRM DRIVER FOR SAVAGE VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/savage/
 -F:    include/uapi/drm/savage_drm.h
 -
 -DRM DRIVER FOR SIS VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/sis/
 -F:    include/uapi/drm/sis_drm.h
 -
  DRM DRIVERS FOR STI
  M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
  M:    Vincent Abriou <vincent.abriou@st.com>
@@@ -4631,20 -4605,36 +4631,20 @@@ S:   Maintaine
  F:    drivers/gpu/drm/stm
  F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
  
 -DRM DRIVER FOR TDFX VIDEO CARDS
 -S:    Orphan / Obsolete
 -F:    drivers/gpu/drm/tdfx/
 -
 -DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 -M:    Dave Airlie <airlied@redhat.com>
 -S:    Odd Fixes
 -F:    drivers/gpu/drm/udl/
 -
 -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
 +DRM DRIVERS FOR TI LCDC
 +M:    Jyri Sarha <jsarha@ti.com>
 +R:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
 -F:    drivers/gpu/drm/etnaviv/
 -F:    include/uapi/drm/etnaviv_drm.h
 -F:    Documentation/devicetree/bindings/display/etnaviv/
 +F:    drivers/gpu/drm/tilcdc/
 +F:    Documentation/devicetree/bindings/display/tilcdc/
  
 -DRM DRIVER FOR VMWARE VIRTUAL GPU
 -M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
 -M:    Sinclair Yeh <syeh@vmware.com>
 -M:    Thomas Hellstrom <thellstrom@vmware.com>
 +DRM DRIVERS FOR TI OMAP
 +M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://people.freedesktop.org/~syeh/repos_linux
 -T:    git git://people.freedesktop.org/~thomash/linux
 -S:    Supported
 -F:    drivers/gpu/drm/vmwgfx/
 -F:    include/uapi/drm/vmwgfx_drm.h
 +S:    Maintained
 +F:    drivers/gpu/drm/omapdrm/
 +F:    Documentation/devicetree/bindings/display/ti/
  
  DRM DRIVERS FOR VC4
  M:    Eric Anholt <eric@anholt.net>
@@@ -4655,16 -4645,20 +4655,16 @@@ F:   include/uapi/drm/vc4_drm.
  F:    Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 -DRM DRIVERS FOR TI OMAP
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 -L:    dri-devel@lists.freedesktop.org
 -S:    Maintained
 -F:    drivers/gpu/drm/omapdrm/
 -F:    Documentation/devicetree/bindings/display/ti/
 -
 -DRM DRIVERS FOR TI LCDC
 -M:    Jyri Sarha <jsarha@ti.com>
 -R:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +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/tilcdc/
 -F:    Documentation/devicetree/bindings/display/tilcdc/
 +F:    drivers/gpu/drm/etnaviv/
 +F:    include/uapi/drm/etnaviv_drm.h
 +F:    Documentation/devicetree/bindings/display/etnaviv/
  
  DRM DRIVERS FOR ZTE ZX
  M:    Shawn Guo <shawnguo@kernel.org>
@@@ -4674,24 -4668,6 +4674,24 @@@ F:    drivers/gpu/drm/zte
  F:    Documentation/devicetree/bindings/display/zte,vou.txt
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +DRM PANEL DRIVERS
 +M:    Thierry Reding <thierry.reding@gmail.com>
 +L:    dri-devel@lists.freedesktop.org
 +T:    git git://anongit.freedesktop.org/tegra/linux.git
 +S:    Maintained
 +F:    drivers/gpu/drm/drm_panel.c
 +F:    drivers/gpu/drm/panel/
 +F:    include/drm/drm_panel.h
 +F:    Documentation/devicetree/bindings/display/panel/
 +
 +DRM TINYDRM DRIVERS
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +W:    https://github.com/notro/tinydrm/wiki/Development
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/
 +F:    include/drm/tinydrm/
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -4823,6 -4799,13 +4823,6 @@@ S:     Maintaine
  F:    drivers/media/usb/dvb-usb-v2/dvb_usb*
  F:    drivers/media/usb/dvb-usb-v2/usb_urb.c
  
 -DONGWOON DW9714 LENS VOICE COIL DRIVER
 -M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/i2c/dw9714.c
 -
  DYNAMIC DEBUG
  M:    Jason Baron <jbaron@akamai.com>
  S:    Maintained
@@@ -4878,6 -4861,19 +4878,6 @@@ S:     Supporte
  F:    Documentation/filesystems/ecryptfs.txt
  F:    fs/ecryptfs/
  
 -EDAC-CORE
 -M:    Borislav Petkov <bp@alien8.de>
 -M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
 -M:    Mauro Carvalho Chehab <mchehab@kernel.org>
 -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/admin-guide/ras.rst
 -F:    Documentation/driver-api/edac.rst
 -F:    drivers/edac/
 -F:    include/linux/edac.h
 -
  EDAC-AMD64
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
@@@ -4899,19 -4895,6 +4899,19 @@@ S:    Supporte
  F:    drivers/edac/octeon_edac*
  F:    drivers/edac/thunderx_edac*
  
 +EDAC-CORE
 +M:    Borislav Petkov <bp@alien8.de>
 +M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
 +M:    Mauro Carvalho Chehab <mchehab@kernel.org>
 +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/admin-guide/ras.rst
 +F:    Documentation/driver-api/edac.rst
 +F:    drivers/edac/
 +F:    include/linux/edac.h
 +
  EDAC-E752X
  M:    Mark Gross <mark.gross@intel.com>
  L:    linux-edac@vger.kernel.org
@@@ -4936,6 -4919,12 +4936,6 @@@ L:     linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
 -EDAC-I82443BXGX
 -M:    Tim Small <tim@buttersideup.com>
 -L:    linux-edac@vger.kernel.org
 -S:    Maintained
 -F:    drivers/edac/i82443bxgx_edac.c
 -
  EDAC-I3000
  L:    linux-edac@vger.kernel.org
  S:    Orphan
@@@ -4967,12 -4956,6 +4967,12 @@@ L:    linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
  
 +EDAC-I82443BXGX
 +M:    Tim Small <tim@buttersideup.com>
 +L:    linux-edac@vger.kernel.org
 +S:    Maintained
 +F:    drivers/edac/i82443bxgx_edac.c
 +
  EDAC-I82975X
  M:    Ranganathan Desikan <ravi@jetztechnologies.com>
  M:    "Arvind R." <arvino55@gmail.com>
@@@ -4992,18 -4975,18 +4992,18 @@@ L:   linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/mpc85xx_edac.[ch]
  
 -EDAC-PND2
 -M:    Tony Luck <tony.luck@intel.com>
 -L:    linux-edac@vger.kernel.org
 -S:    Maintained
 -F:    drivers/edac/pnd2_edac.[ch]
 -
  EDAC-PASEMI
  M:    Egor Martovetsky <egor@pasemi.com>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
  F:    drivers/edac/pasemi_edac.c
  
 +EDAC-PND2
 +M:    Tony Luck <tony.luck@intel.com>
 +L:    linux-edac@vger.kernel.org
 +S:    Maintained
 +F:    drivers/edac/pnd2_edac.[ch]
 +
  EDAC-R82600
  M:    Tim Small <tim@buttersideup.com>
  L:    linux-edac@vger.kernel.org
@@@ -5023,6 -5006,13 +5023,6 @@@ L:     linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/skx_edac.c
  
 -EDAC-XGENE
 -APPLIED MICRO (APM) X-GENE SOC EDAC
 -M:     Loc Ho <lho@apm.com>
 -S:     Supported
 -F:     drivers/edac/xgene_edac.c
 -F:     Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
 -
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -5030,12 -5020,21 +5030,12 @@@ T:   git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/usb/misc/ua101.c
  
 -EXTENSIBLE FIRMWARE INTERFACE (EFI)
 -M:    Matt Fleming <matt@codeblueprint.co.uk>
 -M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
 +EFI TEST DRIVER
  L:    linux-efi@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 +M:    Ivan Hu <ivan.hu@canonical.com>
 +M:    Matt Fleming <matt@codeblueprint.co.uk>
  S:    Maintained
 -F:    Documentation/efi-stub.txt
 -F:    arch/*/kernel/efi.c
 -F:    arch/x86/boot/compressed/eboot.[ch]
 -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
 +F:    drivers/firmware/efi/test/
  
  EFI VARIABLE FILESYSTEM
  M:    Matthew Garrett <matthew.garrett@nebula.com>
@@@ -5052,6 -5051,13 +5052,6 @@@ M:     Peter Jones <pjones@redhat.com
  S:    Maintained
  F:    drivers/video/fbdev/efifb.c
  
 -EFI TEST DRIVER
 -L:    linux-efi@vger.kernel.org
 -M:    Ivan Hu <ivan.hu@canonical.com>
 -M:    Matt Fleming <matt@codeblueprint.co.uk>
 -S:    Maintained
 -F:    drivers/firmware/efi/test/
 -
  EFS FILESYSTEM
  W:    http://aeschi.ch.eu.org/efs/
  S:    Orphan
@@@ -5080,34 -5086,6 +5080,34 @@@ M:    David Woodhouse <dwmw2@infradead.org
  L:    linux-embedded@vger.kernel.org
  S:    Maintained
  
 +Emulex 10Gbps iSCSI - OneConnect DRIVER
 +M:    Subbu Seetharaman <subbu.seetharaman@broadcom.com>
 +M:    Ketan Mukadam <ketan.mukadam@broadcom.com>
 +M:    Jitendra Bhivare <jitendra.bhivare@broadcom.com>
 +L:    linux-scsi@vger.kernel.org
 +W:    http://www.broadcom.com
 +S:    Supported
 +F:    drivers/scsi/be2iscsi/
 +
 +Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
 +M:    Sathya Perla <sathya.perla@broadcom.com>
 +M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
 +M:    Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
 +M:    Somnath Kotur <somnath.kotur@broadcom.com>
 +L:    netdev@vger.kernel.org
 +W:    http://www.emulex.com
 +S:    Supported
 +F:    drivers/net/ethernet/emulex/benet/
 +
 +EMULEX ONECONNECT ROCE DRIVER
 +M:    Selvin Xavier <selvin.xavier@broadcom.com>
 +M:    Devesh Sharma <devesh.sharma@broadcom.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.broadcom.com
 +S:    Odd Fixes
 +F:    drivers/infiniband/hw/ocrdma/
 +F:    include/uapi/rdma/ocrdma-abi.h
 +
  EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
  M:    James Smart <james.smart@broadcom.com>
  M:    Dick Kennedy <dick.kennedy@broadcom.com>
@@@ -5160,21 -5138,12 +5160,21 @@@ M:   Andrew Lunn <andrew@lunn.ch
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    include/linux/phy.h
 -F:    include/linux/phy_fixed.h
 -F:    drivers/net/phy/
 +F:    Documentation/ABI/testing/sysfs-bus-mdio
 +F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/networking/phy.txt
 +F:    drivers/net/phy/
  F:    drivers/of/of_mdio.c
  F:    drivers/of/of_net.c
 +F:    include/linux/*mdio*.h
 +F:    include/linux/of_net.h
 +F:    include/linux/phy.h
 +F:    include/linux/phy_fixed.h
 +F:    include/linux/platform_data/mdio-gpio.h
 +F:    include/linux/platform_data/mdio-bcm-unimac.h
 +F:    include/trace/events/mdio.h
 +F:    include/uapi/linux/mdio.h
 +F:    include/uapi/linux/mii.h
  
  EXT2 FILE SYSTEM
  M:    Jan Kara <jack@suse.com>
@@@ -5202,22 -5171,6 +5202,22 @@@ L:    linux-security-module@vger.kernel.or
  S:    Supported
  F:    security/integrity/evm/
  
 +EXTENSIBLE FIRMWARE INTERFACE (EFI)
 +M:    Matt Fleming <matt@codeblueprint.co.uk>
 +M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
 +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/*/kernel/efi.c
 +F:    arch/x86/boot/compressed/eboot.[ch]
 +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
 +
  EXTERNAL CONNECTOR SUBSYSTEM (EXTCON)
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Chanwoo Choi <cw00.choi@samsung.com>
@@@ -5248,19 -5201,6 +5248,19 @@@ S:    Supporte
  F:    arch/arc/plat-eznps
  F:    arch/arc/boot/dts/eznps.dts
  
 +F2FS FILE SYSTEM
 +M:    Jaegeuk Kim <jaegeuk@kernel.org>
 +M:    Chao Yu <yuchao0@huawei.com>
 +L:    linux-f2fs-devel@lists.sourceforge.net
 +W:    https://f2fs.wiki.kernel.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 +S:    Maintained
 +F:    Documentation/filesystems/f2fs.txt
 +F:    Documentation/ABI/testing/sysfs-fs-f2fs
 +F:    fs/f2fs/
 +F:    include/linux/f2fs_fs.h
 +F:    include/trace/events/f2fs.h
 +
  F71805F HARDWARE MONITORING DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -5268,10 -5208,25 +5268,10 @@@ S:   Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 -FC0011 TUNER DRIVER
 -M:    Michael Buesch <m@bues.ch>
 -L:    linux-media@vger.kernel.org
 -S:    Maintained
 -F:    drivers/media/tuners/fc0011.h
 -F:    drivers/media/tuners/fc0011.c
 -
 -FC2580 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/tuners/fc2580*
 -
  FANOTIFY
 -M:    Eric Paris <eparis@redhat.com>
 +M:    Jan Kara <jack@suse.cz>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    fs/notify/fanotify/
  F:    include/linux/fanotify.h
@@@ -5294,23 -5249,6 +5294,23 @@@ M:    Thomas Petazzoni <thomas.petazzoni@f
  S:    Maintained
  F:    drivers/staging/fbtft/
  
 +FC0011 TUNER DRIVER
 +M:    Michael Buesch <m@bues.ch>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/tuners/fc0011.h
 +F:    drivers/media/tuners/fc0011.c
 +
 +FC2580 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/tuners/fc2580*
 +
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
  M:    Johannes Thumshirn <jth@kernel.org>
  L:    fcoe-devel@open-fcoe.org
@@@ -5414,11 -5352,10 +5414,11 @@@ K:   fmc_d.*registe
  
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <atull@kernel.org>
 -R:    Moritz Fischer <moritz.fischer@ettus.com>
 +R:    Moritz Fischer <mdf@kernel.org>
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
 +Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
  F:    Documentation/devicetree/bindings/fpga/
  F:    drivers/fpga/
@@@ -5471,14 -5408,6 +5471,14 @@@ L:    linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 +M:    Claudiu Manoil <claudiu.manoil@freescale.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/gianfar*
 +X:    drivers/net/ethernet/freescale/gianfar_ptp.c
 +F:    Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
 +
  FREESCALE GPMI NAND DRIVER
  M:    Han Xu <han.xu@nxp.com>
  L:    linux-mtd@lists.infradead.org
@@@ -5492,15 -5421,6 +5492,15 @@@ L:    linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cpm.c
  
 +FREESCALE IMX / MXC FEC DRIVER
 +M:    Fugang Duan <fugang.duan@nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/fec_main.c
 +F:    drivers/net/ethernet/freescale/fec_ptp.c
 +F:    drivers/net/ethernet/freescale/fec.h
 +F:    Documentation/devicetree/bindings/net/fsl-fec.txt
 +
  FREESCALE IMX / MXC FRAMEBUFFER DRIVER
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-fbdev@vger.kernel.org
@@@ -5509,11 -5429,29 +5509,11 @@@ S:   Maintaine
  F:    include/linux/platform_data/video-imxfb.h
  F:    drivers/video/fbdev/imxfb.c
  
 -FREESCALE QUAD SPI DRIVER
 -M:    Han Xu <han.xu@nxp.com>
 -L:    linux-mtd@lists.infradead.org
 -S:    Maintained
 -F:    drivers/mtd/spi-nor/fsl-quadspi.c
 -
 -FREESCALE SOC FS_ENET DRIVER
 -M:    Pantelis Antoniou <pantelis.antoniou@gmail.com>
 -M:    Vitaly Bordug <vbordug@ru.mvista.com>
 -L:    linuxppc-dev@lists.ozlabs.org
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/freescale/fs_enet/
 -F:    include/linux/fs_enet_pd.h
 -
 -FREESCALE IMX / MXC FEC DRIVER
 -M:    Fugang Duan <fugang.duan@nxp.com>
 +FREESCALE QORIQ DPAA ETHERNET DRIVER
 +M:    Madalin Bucur <madalin.bucur@nxp.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/ethernet/freescale/fec_main.c
 -F:    drivers/net/ethernet/freescale/fec_ptp.c
 -F:    drivers/net/ethernet/freescale/fec.h
 -F:    Documentation/devicetree/bindings/net/fsl-fec.txt
 +F:    drivers/net/ethernet/freescale/dpaa
  
  FREESCALE QORIQ DPAA FMAN DRIVER
  M:    Madalin Bucur <madalin.bucur@nxp.com>
@@@ -5522,11 -5460,20 +5522,11 @@@ S:   Maintaine
  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:    Li Yang <leoyang.li@nxp.com>
 -L:    linuxppc-dev@lists.ozlabs.org
 -L:    linux-arm-kernel@lists.infradead.org
 +FREESCALE QUAD SPI DRIVER
 +M:    Han Xu <han.xu@nxp.com>
 +L:    linux-mtd@lists.infradead.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/soc/fsl/
 -F:    drivers/soc/fsl/
 -F:    include/linux/fsl/
 +F:    drivers/mtd/spi-nor/fsl-quadspi.c
  
  FREESCALE QUICC ENGINE LIBRARY
  M:    Qiang Zhao <qiang.zhao@nxp.com>
@@@ -5536,6 -5483,13 +5536,6 @@@ F:     drivers/soc/fsl/qe
  F:    include/soc/fsl/*qe*.h
  F:    include/soc/fsl/*ucc*.h
  
 -FREESCALE USB PERIPHERAL DRIVERS
 -M:    Li Yang <leoyang.li@nxp.com>
 -L:    linux-usb@vger.kernel.org
 -L:    linuxppc-dev@lists.ozlabs.org
 -S:    Maintained
 -F:    drivers/usb/gadget/udc/fsl*
 -
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <leoyang.li@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -5543,6 -5497,14 +5543,6 @@@ L:     linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/net/ethernet/freescale/ucc_geth*
  
 -FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 -M:    Claudiu Manoil <claudiu.manoil@freescale.com>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/freescale/gianfar*
 -X:    drivers/net/ethernet/freescale/gianfar_ptp.c
 -F:    Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
 -
  FREESCALE QUICC ENGINE UCC HDLC DRIVER
  M:    Zhao Qiang <qiang.zhao@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -5556,24 -5518,6 +5556,24 @@@ L:    linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/tty/serial/ucc_uart.c
  
 +FREESCALE SOC DRIVERS
 +M:    Li Yang <leoyang.li@nxp.com>
 +L:    linuxppc-dev@lists.ozlabs.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/fsl/
 +F:    drivers/soc/fsl/
 +F:    include/linux/fsl/
 +
 +FREESCALE SOC FS_ENET DRIVER
 +M:    Pantelis Antoniou <pantelis.antoniou@gmail.com>
 +M:    Vitaly Bordug <vbordug@ru.mvista.com>
 +L:    linuxppc-dev@lists.ozlabs.org
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/fs_enet/
 +F:    include/linux/fs_enet_pd.h
 +
  FREESCALE SOC SOUND DRIVERS
  M:    Timur Tabi <timur@tabi.org>
  M:    Nicolin Chen <nicoleotsuka@gmail.com>
@@@ -5586,13 -5530,6 +5586,13 @@@ F:    sound/soc/fsl/fsl
  F:    sound/soc/fsl/imx*
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
 +FREESCALE USB PERIPHERAL DRIVERS
 +M:    Li Yang <leoyang.li@nxp.com>
 +L:    linux-usb@vger.kernel.org
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Maintained
 +F:    drivers/usb/gadget/udc/fsl*
 +
  FREEVXFS FILESYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
  W:    ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@@ -5633,6 -5570,19 +5633,6 @@@ S:     Supporte
  F:    fs/crypto/
  F:    include/linux/fscrypt*.h
  
 -F2FS FILE SYSTEM
 -M:    Jaegeuk Kim <jaegeuk@kernel.org>
 -M:    Chao Yu <yuchao0@huawei.com>
 -L:    linux-f2fs-devel@lists.sourceforge.net
 -W:    https://f2fs.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 -S:    Maintained
 -F:    Documentation/filesystems/f2fs.txt
 -F:    Documentation/ABI/testing/sysfs-fs-f2fs
 -F:    fs/f2fs/
 -F:    include/linux/f2fs_fs.h
 -F:    include/trace/events/f2fs.h
 -
  FUJITSU FR-V (FRV) PORT
  S:    Orphan
  F:    arch/frv/
@@@ -5706,12 -5656,6 +5706,12 @@@ S:    Maintaine
  F:    kernel/gcov/
  F:    Documentation/dev-tools/gcov.rst
  
 +GDB KERNEL DEBUGGING HELPER SCRIPTS
 +M:    Jan Kiszka <jan.kiszka@siemens.com>
 +M:    Kieran Bingham <kieran@bingham.xyz>
 +S:    Supported
 +F:    scripts/gdb/
 +
  GDT SCSI DISK ARRAY CONTROLLER DRIVER
  M:    Achim Leubner <achim_leubner@adaptec.com>
  L:    linux-scsi@vger.kernel.org
@@@ -5719,6 -5663,12 +5719,6 @@@ W:     http://www.icp-vortex.com
  S:    Supported
  F:    drivers/scsi/gdt*
  
 -GDB KERNEL DEBUGGING HELPER SCRIPTS
 -M:    Jan Kiszka <jan.kiszka@siemens.com>
 -M:    Kieran Bingham <kieran@bingham.xyz>
 -S:    Supported
 -F:    scripts/gdb/
 -
  GEMTEK FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -5785,17 -5735,17 +5785,17 @@@ L:   kvm@vger.kernel.or
  S:    Supported
  F:    drivers/uio/uio_pci_generic.c
  
 -GET_MAINTAINER SCRIPT
 -M:    Joe Perches <joe@perches.com>
 -S:    Maintained
 -F:    scripts/get_maintainer.pl
 -
  GENWQE (IBM Generic Workqueue Card)
  M:    Frank Haverkamp <haver@linux.vnet.ibm.com>
  M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
  S:    Supported
  F:    drivers/misc/genwqe/
  
 +GET_MAINTAINER SCRIPT
 +M:    Joe Perches <joe@perches.com>
 +S:    Maintained
 +F:    scripts/get_maintainer.pl
 +
  GFS2 FILE SYSTEM
  M:    Steven Whitehouse <swhiteho@redhat.com>
  M:    Bob Peterson <rpeterso@redhat.com>
@@@ -5828,21 -5778,6 +5828,21 @@@ L:    linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/input/touchscreen/goodix.c
  
 +GPIO ACPI SUPPORT
 +M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +L:    linux-gpio@vger.kernel.org
 +L:    linux-acpi@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/acpi/gpio-properties.txt
 +F:    drivers/gpio/gpiolib-acpi.c
 +
 +GPIO IR Transmitter
 +M:    Sean Young <sean@mess.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/rc/gpio-ir-tx.c
 +
  GPIO MOCKUP DRIVER
  M:    Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
  L:    linux-gpio@vger.kernel.org
@@@ -5866,6 -5801,15 +5866,6 @@@ F:     include/asm-generic/gpio.
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
 -GPIO ACPI SUPPORT
 -M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 -L:    linux-gpio@vger.kernel.org
 -L:    linux-acpi@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/acpi/gpio-properties.txt
 -F:    drivers/gpio/gpiolib-acpi.c
 -
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>
  L:    netdev@vger.kernel.org
@@@ -5880,6 -5824,14 +5880,6 @@@ L:     netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/aeroflex/
  
 -GREYBUS SUBSYSTEM
 -M:    Johan Hovold <johan@kernel.org>
 -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 (moderated for non-subscribers)
 -
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <vaibhav.sr@gmail.com>
  M:    Mark Greer <mgreer@animalcreek.com>
@@@ -5897,7 -5849,24 +5897,7 @@@ F:     drivers/staging/greybus/audio_manage
  F:    drivers/staging/greybus/audio_module.c
  F:    drivers/staging/greybus/audio_topology.c
  
 -GREYBUS PROTOCOLS DRIVERS
 -M:    Rui Miguel Silva <rmfrfs@gmail.com>
 -S:    Maintained
 -F:    drivers/staging/greybus/sdio.c
 -F:    drivers/staging/greybus/light.c
 -F:    drivers/staging/greybus/gpio.c
 -F:    drivers/staging/greybus/power_supply.c
 -F:    drivers/staging/greybus/spi.c
 -F:    drivers/staging/greybus/spilib.c
 -
 -GREYBUS PROTOCOLS DRIVERS
 -M:    Bryan O'Donoghue <pure.logic@nexus-software.ie>
 -S:    Maintained
 -F:    drivers/staging/greybus/loopback.c
 -F:    drivers/staging/greybus/timesync.c
 -F:    drivers/staging/greybus/timesync_platform.c
 -
 -GREYBUS PROTOCOLS DRIVERS
 +GREYBUS FW/HID/SPI PROTOCOLS DRIVERS
  M:    Viresh Kumar <vireshk@kernel.org>
  S:    Maintained
  F:    drivers/staging/greybus/authentication.c
@@@ -5914,12 -5883,11 +5914,12 @@@ F:   drivers/staging/greybus/spi.
  F:    drivers/staging/greybus/spilib.c
  F:    drivers/staging/greybus/spilib.h
  
 -GREYBUS PROTOCOLS DRIVERS
 -M:    David Lin <dtwlin@gmail.com>
 +GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS
 +M:    Bryan O'Donoghue <pure.logic@nexus-software.ie>
  S:    Maintained
 -F:    drivers/staging/greybus/uart.c
 -F:    drivers/staging/greybus/log.c
 +F:    drivers/staging/greybus/loopback.c
 +F:    drivers/staging/greybus/timesync.c
 +F:    drivers/staging/greybus/timesync_platform.c
  
  GREYBUS PLATFORM DRIVERS
  M:    Vaibhav Hiremath <hvaibhav.linux@gmail.com>
@@@ -5928,30 -5896,6 +5928,30 @@@ F:    drivers/staging/greybus/arche-platfo
  F:    drivers/staging/greybus/arche-apb-ctrl.c
  F:    drivers/staging/greybus/arche_platform.h
  
 +GREYBUS SDIO/GPIO/SPI PROTOCOLS DRIVERS
 +M:    Rui Miguel Silva <rmfrfs@gmail.com>
 +S:    Maintained
 +F:    drivers/staging/greybus/sdio.c
 +F:    drivers/staging/greybus/light.c
 +F:    drivers/staging/greybus/gpio.c
 +F:    drivers/staging/greybus/power_supply.c
 +F:    drivers/staging/greybus/spi.c
 +F:    drivers/staging/greybus/spilib.c
 +
 +GREYBUS SUBSYSTEM
 +M:    Johan Hovold <johan@kernel.org>
 +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 (moderated for non-subscribers)
 +
 +GREYBUS UART PROTOCOLS DRIVERS
 +M:    David Lin <dtwlin@gmail.com>
 +S:    Maintained
 +F:    drivers/staging/greybus/uart.c
 +F:    drivers/staging/greybus/log.c
 +
  GS1662 VIDEO SERIALIZER
  M:    Charles-Antoine Couret <charles-antoine.couret@nexvision.fr>
  L:    linux-media@vger.kernel.org
@@@ -6022,6 -5966,13 +6022,6 @@@ L:     linux-efi@vger.kernel.or
  S:    Maintained
  F:    block/partitions/efi.*
  
 -STK1160 USB VIDEO CAPTURE DRIVER
 -M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/usb/stk1160/
 -
  H8/300 ARCHITECTURE
  M:    Yoshinori Sato <ysato@users.sourceforge.jp>
  L:    uclinux-h8-devel@lists.sourceforge.jp (moderated for non-subscribers)
@@@ -6033,6 -5984,33 +6033,6 @@@ F:     drivers/clocksource/h8300_*.
  F:    drivers/clk/h8300/
  F:    drivers/irqchip/irq-renesas-h8*.c
  
 -HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 -M:    Frank Seidel <frank@f-seidel.de>
 -L:    platform-driver-x86@vger.kernel.org
 -W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 -S:    Maintained
 -F:    drivers/platform/x86/hdaps.c
 -
 -HDPVR USB VIDEO ENCODER DRIVER
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    https://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/usb/hdpvr/
 -
 -HWPOISON MEMORY FAILURE HANDLING
 -M:    Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
 -L:    linux-mm@kvack.org
 -S:    Maintained
 -F:    mm/memory-failure.c
 -F:    mm/hwpoison-inject.c
 -
 -HYPERVISOR VIRTUAL CONSOLE DRIVER
 -L:    linuxppc-dev@lists.ozlabs.org
 -S:    Odd Fixes
 -F:    drivers/tty/hvc/
 -
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -6043,13 -6021,6 +6043,13 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/usb/hackrf/
  
 +HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 +M:    Frank Seidel <frank@f-seidel.de>
 +L:    platform-driver-x86@vger.kernel.org
 +W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 +S:    Maintained
 +F:    drivers/platform/x86/hdaps.c
 +
  HARDWARE MONITORING
  M:    Jean Delvare <jdelvare@suse.com>
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -6088,14 -6059,6 +6088,14 @@@ L:    linux-parisc@vger.kernel.or
  S:    Maintained
  F:    sound/parisc/harmony.*
  
 +HDPVR USB VIDEO ENCODER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    https://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/usb/hdpvr/
 +
  HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
  M:    Jimmy Vance <jimmy.vance@hpe.com>
  S:    Supported
@@@ -6112,6 -6075,23 +6112,6 @@@ F:     drivers/scsi/hpsa*.[ch
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
  
 -HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 -L:    linux-scsi@vger.kernel.org
 -S:    Supported
 -F:    Documentation/blockdev/cciss.txt
 -F:    drivers/block/cciss*
 -F:    include/linux/cciss_ioctl.h
 -F:    include/uapi/linux/cciss_ioctl.h
 -
 -OPA-VNIC DRIVER
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -M:    Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
 -L:    linux-rdma@vger.kernel.org
 -S:    Supported
 -F:    drivers/infiniband/ulp/opa_vnic
 -
  HFI1 DRIVER
  M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
  M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
@@@ -6217,14 -6197,6 +6217,14 @@@ S:    Maintaine
  F:    drivers/net/ethernet/hisilicon/
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  
 +HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
 +M:    Yisen Zhuang <yisen.zhuang@huawei.com>
 +M:    Salil Mehta <salil.mehta@huawei.com>
 +L:    netdev@vger.kernel.org
 +W:    http://www.hisilicon.com
 +S:    Maintained
 +F:    drivers/net/ethernet/hisilicon/hns3/
 +
  HISILICON ROCE DRIVER
  M:    Lijun Ou <oulijun@huawei.com>
  M:    Wei Hu(Xavier) <xavier.huwei@huawei.com>
@@@ -6297,25 -6269,12 +6297,25 @@@ L:   netdev@vger.kernel.or
  S:    Maintained
  F:    net/hsr/
  
 +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
 +
  HTCPEN TOUCHSCREEN DRIVER
  M:    Pau Oliva Fora <pof@eslack.org>
  L:    linux-input@vger.kernel.org
  S:    Maintained
  F:    drivers/input/touchscreen/htcpen.c
  
 +HUAWEI ETHERNET DRIVER
 +M:    Aviad Krawczyk <aviad.krawczyk@huawei.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    Documentation/networking/hinic.txt
 +F:    drivers/net/ethernet/huawei/hinic/
 +
  HUGETLB FILESYSTEM
  M:    Nadia Yvette Chambers <nyc@holomorphy.com>
  S:    Maintained
@@@ -6329,22 -6288,13 +6329,22 @@@ W:   https://linuxtv.or
  S:    Supported
  F:    drivers/media/platform/sti/hva
  
 +HWPOISON MEMORY FAILURE HANDLING
 +M:    Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    mm/memory-failure.c
 +F:    mm/hwpoison-inject.c
 +
  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:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
 +F:    arch/x86/include/asm/trace/hyperv.h
  F:    arch/x86/include/uapi/asm/hyperv.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
@@@ -6356,26 -6306,12 +6356,26 @@@ 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:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
 +F:    include/uapi/linux/hyperv.h
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
 -I2C MUXES
 -M:    Peter Rosin <peda@axentia.se>
 +HYPERVISOR VIRTUAL CONSOLE DRIVER
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Odd Fixes
 +F:    drivers/tty/hvc/
 +
 +I2C ACPI SUPPORT
 +M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +L:    linux-i2c@vger.kernel.org
 +L:    linux-acpi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/i2c-core-acpi.c
 +
 +I2C MUXES
 +M:    Peter Rosin <peda@axentia.se>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/i2c-topology
@@@ -6396,36 -6332,6 +6396,36 @@@ F:    Documentation/i2c/busses/i2c-parport
  F:    drivers/i2c/busses/i2c-parport.c
  F:    drivers/i2c/busses/i2c-parport-light.c
  
 +I2C SUBSYSTEM
 +M:    Wolfram Sang <wsa@the-dreams.de>
 +L:    linux-i2c@vger.kernel.org
 +W:    https://i2c.wiki.kernel.org/
 +Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/
 +F:    Documentation/i2c/
 +F:    drivers/i2c/
 +F:    drivers/i2c/*/
 +F:    include/linux/i2c.h
 +F:    include/linux/i2c-*.h
 +F:    include/uapi/linux/i2c.h
 +F:    include/uapi/linux/i2c-*.h
 +
 +I2C-TAOS-EVM DRIVER
 +M:    Jean Delvare <jdelvare@suse.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-taos-evm
 +F:    drivers/i2c/busses/i2c-taos-evm.c
 +
 +I2C-TINY-USB DRIVER
 +M:    Till Harbaum <till@harbaum.org>
 +L:    linux-i2c@vger.kernel.org
 +W:    http://www.harbaum.org/till/i2c_tiny_usb
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-tiny-usb.c
 +
  I2C/SMBUS CONTROLLER DRIVERS FOR PC
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
@@@ -6460,12 -6366,6 +6460,12 @@@ F:    drivers/i2c/busses/i2c-sis96x.
  F:    drivers/i2c/busses/i2c-via.c
  F:    drivers/i2c/busses/i2c-viapro.c
  
 +I2C/SMBUS INTEL CHT WHISKEY COVE PMIC DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-cht-wc.c
 +
  I2C/SMBUS ISMT DRIVER
  M:    Seth Heasley <seth.heasley@intel.com>
  M:    Neil Horman <nhorman@tuxdriver.com>
@@@ -6479,6 -6379,43 +6479,6 @@@ L:     linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/i2c-stub.c
  
 -I2C SUBSYSTEM
 -M:    Wolfram Sang <wsa@the-dreams.de>
 -L:    linux-i2c@vger.kernel.org
 -W:    https://i2c.wiki.kernel.org/
 -Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/
 -F:    Documentation/i2c/
 -F:    drivers/i2c/
 -F:    drivers/i2c/*/
 -F:    include/linux/i2c.h
 -F:    include/linux/i2c-*.h
 -F:    include/uapi/linux/i2c.h
 -F:    include/uapi/linux/i2c-*.h
 -
 -I2C ACPI SUPPORT
 -M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -L:    linux-i2c@vger.kernel.org
 -L:    linux-acpi@vger.kernel.org
 -S:    Maintained
 -F:    drivers/i2c/i2c-core-acpi.c
 -
 -I2C-TAOS-EVM DRIVER
 -M:    Jean Delvare <jdelvare@suse.com>
 -L:    linux-i2c@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/i2c/busses/i2c-taos-evm
 -F:    drivers/i2c/busses/i2c-taos-evm.c
 -
 -I2C-TINY-USB DRIVER
 -M:    Till Harbaum <till@harbaum.org>
 -L:    linux-i2c@vger.kernel.org
 -W:    http://www.harbaum.org/till/i2c_tiny_usb
 -S:    Maintained
 -F:    drivers/i2c/busses/i2c-tiny-usb.c
 -
  i386 BOOT CODE
  M:    "H. Peter Anvin" <hpa@zytor.com>
  S:    Maintained
@@@ -6497,15 -6434,17 +6497,15 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/ia64/
  
 -IBM Power VMX Cryptographic instructions
 -M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
 -M:    Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 -L:    linux-crypto@vger.kernel.org
 +IBM Power 842 compression accelerator
 +M:    Haren Myneni <haren@us.ibm.com>
  S:    Supported
 -F:    drivers/crypto/vmx/Makefile
 -F:    drivers/crypto/vmx/Kconfig
 -F:    drivers/crypto/vmx/vmx.c
 -F:    drivers/crypto/vmx/aes*
 -F:    drivers/crypto/vmx/ghash*
 -F:    drivers/crypto/vmx/ppc-xlate.pl
 +F:    drivers/crypto/nx/Makefile
 +F:    drivers/crypto/nx/Kconfig
 +F:    drivers/crypto/nx/nx-842*
 +F:    include/linux/sw842.h
 +F:    crypto/842.c
 +F:    lib/842/
  
  IBM Power in-Nest Crypto Acceleration
  M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
@@@ -6520,38 -6459,33 +6520,38 @@@ F:   drivers/crypto/nx/nx.
  F:    drivers/crypto/nx/nx_csbcpb.h
  F:    drivers/crypto/nx/nx_debugfs.h
  
 -IBM Power 842 compression accelerator
 -M:    Haren Myneni <haren@us.ibm.com>
 -S:    Supported
 -F:    drivers/crypto/nx/Makefile
 -F:    drivers/crypto/nx/Kconfig
 -F:    drivers/crypto/nx/nx-842*
 -F:    include/linux/sw842.h
 -F:    crypto/842.c
 -F:    lib/842/
 -
  IBM Power Linux RAID adapter
  M:    Brian King <brking@us.ibm.com>
  S:    Supported
  F:    drivers/scsi/ipr.*
  
 -IBM Power Virtual Ethernet Device Driver
 +IBM Power SRIOV Virtual NIC Device Driver
  M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 +M:    John Allen <jallen@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/net/ethernet/ibm/ibmveth.*
 +F:    drivers/net/ethernet/ibm/ibmvnic.*
  
 -IBM Power SRIOV Virtual NIC Device Driver
 +IBM Power Virtual Accelerator Switchboard
 +M:    Sukadev Bhattiprolu
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Supported
 +F:    arch/powerpc/platforms/powernv/vas*
 +F:    arch/powerpc/platforms/powernv/copy-paste.h
 +F:    arch/powerpc/include/asm/vas.h
 +F:    arch/powerpc/include/uapi/asm/vas.h
 +
 +IBM Power Virtual Ethernet Device Driver
  M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 -M:    John Allen <jallen@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/net/ethernet/ibm/ibmvnic.*
 +F:    drivers/net/ethernet/ibm/ibmveth.*
 +
 +IBM Power Virtual FC Device Drivers
 +M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/ibmvscsi/ibmvfc*
  
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
@@@ -6568,17 -6502,11 +6568,17 @@@ L:   target-devel@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/ibmvscsi_tgt/
  
 -IBM Power Virtual FC Device Drivers
 -M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 -L:    linux-scsi@vger.kernel.org
 +IBM Power VMX Cryptographic instructions
 +M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
 +M:    Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 +L:    linux-crypto@vger.kernel.org
  S:    Supported
 -F:    drivers/scsi/ibmvscsi/ibmvfc*
 +F:    drivers/crypto/vmx/Makefile
 +F:    drivers/crypto/vmx/Kconfig
 +F:    drivers/crypto/vmx/vmx.c
 +F:    drivers/crypto/vmx/aes*
 +F:    drivers/crypto/vmx/ghash*
 +F:    drivers/crypto/vmx/ppc-xlate.pl
  
  IBM ServeRAID RAID DRIVER
  S:    Orphan
@@@ -6590,6 -6518,11 +6590,6 @@@ S:     Maintaine
  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
@@@ -6600,13 -6533,6 +6600,13 @@@ F:    Documentation/ide
  F:    drivers/ide/
  F:    include/linux/ide.h
  
 +IDE/ATAPI DRIVERS
 +M:    Borislav Petkov <bp@alien8.de>
 +L:    linux-ide@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/cdrom/ide-cd
 +F:    drivers/ide/ide-cd*
 +
  IDEAPAD LAPTOP EXTRAS DRIVER
  M:    Ike Panhc <ike.pan@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -6621,10 -6547,12 +6621,10 @@@ W:   https://github.com/o2genum/ideapad-s
  S:    Maintained
  F:    drivers/input/misc/ideapad_slidebar.c
  
 -IDE/ATAPI DRIVERS
 -M:    Borislav Petkov <bp@alien8.de>
 -L:    linux-ide@vger.kernel.org
 +IDT VersaClock 5 CLOCK DRIVER
 +M:    Marek Vasut <marek.vasut@gmail.com>
  S:    Maintained
 -F:    Documentation/cdrom/ide-cd
 -F:    drivers/ide/ide-cd*
 +F:    drivers/clk/clk-versaclock5.c
  
  IEEE 802.15.4 SUBSYSTEM
  M:    Alexander Aring <alex.aring@gmail.com>
@@@ -6714,16 -6642,6 +6714,16 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
  F:    drivers/auxdisplay/img-ascii-lcd.c
  
 +IMGTEC IR DECODER DRIVER
 +M:    James Hogan <james.hogan@imgtec.com>
 +S:    Maintained
 +F:    drivers/media/rc/img-ir/
 +
 +IMS TWINTURBO FRAMEBUFFER DRIVER
 +L:    linux-fbdev@vger.kernel.org
 +S:    Orphan
 +F:    drivers/video/fbdev/imsttfb.c
 +
  INA209 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
@@@ -6749,6 -6667,37 +6749,6 @@@ W:     http://industrypack.sourceforge.ne
  S:    Maintained
  F:    drivers/ipack/
  
 -INGENIC JZ4780 DMA Driver
 -M:    Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
 -S:    Maintained
 -F:    drivers/dma/dma-jz4780.c
 -
 -INGENIC JZ4780 NAND DRIVER
 -M:    Harvey Hunt <harveyhuntnexus@gmail.com>
 -L:    linux-mtd@lists.infradead.org
 -S:    Maintained
 -F:    drivers/mtd/nand/jz4780_*
 -
 -INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 -M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 -L:    linux-ima-devel@lists.sourceforge.net
 -L:    linux-ima-user@lists.sourceforge.net
 -L:    linux-security-module@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
 -S:    Supported
 -F:    security/integrity/ima/
 -
 -IMGTEC IR DECODER DRIVER
 -M:    James Hogan <james.hogan@imgtec.com>
 -S:    Maintained
 -F:    drivers/media/rc/img-ir/
 -
 -IMS TWINTURBO FRAMEBUFFER DRIVER
 -L:    linux-fbdev@vger.kernel.org
 -S:    Orphan
 -F:    drivers/video/fbdev/imsttfb.c
 -
  INFINIBAND SUBSYSTEM
  M:    Doug Ledford <dledford@redhat.com>
  M:    Sean Hefty <sean.hefty@intel.com>
@@@ -6765,21 -6714,10 +6765,21 @@@ F:   include/uapi/linux/if_infiniband.
  F:    include/uapi/rdma/
  F:    include/rdma/
  
 +INGENIC JZ4780 DMA Driver
 +M:    Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
 +S:    Maintained
 +F:    drivers/dma/dma-jz4780.c
 +
 +INGENIC JZ4780 NAND DRIVER
 +M:    Harvey Hunt <harveyhuntnexus@gmail.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/jz4780_*
 +
  INOTIFY
 -M:    John McCutchan <john@johnmccutchan.com>
 -M:    Robert Love <rlove@rlove.org>
 -M:    Eric Paris <eparis@parisplace.org>
 +M:    Jan Kara <jack@suse.cz>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/inotify.txt
  F:    fs/notify/inotify/
@@@ -6814,22 -6752,6 +6814,22 @@@ F:    drivers/crypto/inside-secure
  S:    Maintained
  L:    linux-crypto@vger.kernel.org
  
 +INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 +M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 +L:    linux-ima-devel@lists.sourceforge.net
 +L:    linux-ima-user@lists.sourceforge.net
 +L:    linux-security-module@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
 +S:    Supported
 +F:    security/integrity/ima/
 +
 +INTEL 810/815 FRAMEBUFFER DRIVER
 +M:    Antonino Daplas <adaplas@gmail.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/fbdev/i810/
 +
  INTEL ASoC BDW/HSW DRIVERS
  M:    Jie Yang <yang.jie@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -6847,75 -6769,17 +6847,75 @@@ T:   git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
 +INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 +M:    Jani Nikula <jani.nikula@linux.intel.com>
 +M:    Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
 +M:    Rodrigo Vivi <rodrigo.vivi@intel.com>
 +L:    intel-gfx@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
 +F:    drivers/gpu/drm/i915/
 +F:    include/drm/i915*
 +F:    include/uapi/drm/i915_drm.h
 +F:    Documentation/gpu/i915.rst
 +
 +INTEL ETHERNET DRIVERS
 +M:    Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 +L:    intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
 +W:    http://www.intel.com/support/feedback.htm
 +W:    http://e1000.sourceforge.net/
 +Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
 +S:    Supported
 +F:    Documentation/networking/e100.txt
 +F:    Documentation/networking/e1000.txt
 +F:    Documentation/networking/e1000e.txt
 +F:    Documentation/networking/igb.txt
 +F:    Documentation/networking/igbvf.txt
 +F:    Documentation/networking/ixgb.txt
 +F:    Documentation/networking/ixgbe.txt
 +F:    Documentation/networking/ixgbevf.txt
 +F:    Documentation/networking/i40e.txt
 +F:    Documentation/networking/i40evf.txt
 +F:    drivers/net/ethernet/intel/
 +F:    drivers/net/ethernet/intel/*/
 +F:    include/linux/avf/virtchnl.h
 +
 +INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 +M:    Maik Broemme <mbroemme@libmpq.org>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/fb/intelfb.txt
 +F:    drivers/video/fbdev/intelfb/
 +
 +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/
 +
  INTEL HID EVENT DRIVER
  M:    Alex Hung <alex.hung@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/intel-hid.c
  
 -INTEL VIRTUAL BUTTON DRIVER
 -M:    AceLan Kao <acelan.kao@canonical.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/intel-vbtn.c
 +INTEL I/OAT DMA DRIVER
 +M:    Dave Jiang <dave.jiang@intel.com>
 +R:    Dan Williams <dan.j.williams@intel.com>
 +L:    dmaengine@vger.kernel.org
 +Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
 +S:    Supported
 +F:    drivers/dma/ioat*
  
  INTEL IDLE DRIVER
  M:    Jacob Pan <jacob.jun.pan@linux.intel.com>
@@@ -6933,6 -6797,41 +6933,6 @@@ L:     linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/hid/intel-ish-hid/
  
 -INTEL PSTATE DRIVER
 -M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 -M:    Len Brown <lenb@kernel.org>
 -L:    linux-pm@vger.kernel.org
 -S:    Supported
 -F:    drivers/cpufreq/intel_pstate.c
 -
 -INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -M:    Maik Broemme <mbroemme@libmpq.org>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/fb/intelfb.txt
 -F:    drivers/video/fbdev/intelfb/
 -
 -INTEL 810/815 FRAMEBUFFER DRIVER
 -M:    Antonino Daplas <adaplas@gmail.com>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/video/fbdev/i810/
 -
 -INTEL MENLOW THERMAL DRIVER
 -M:    Sujith Thomas <sujith.thomas@intel.com>
 -L:    platform-driver-x86@vger.kernel.org
 -W:    https://01.org/linux-acpi
 -S:    Supported
 -F:    drivers/platform/x86/intel_menlow.c
 -
 -INTEL I/OAT DMA DRIVER
 -M:    Dave Jiang <dave.jiang@intel.com>
 -R:    Dan Williams <dan.j.williams@intel.com>
 -L:    dmaengine@vger.kernel.org
 -Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
 -S:    Supported
 -F:    drivers/dma/ioat*
 -
  INTEL IOMMU (VT-d)
  M:    David Woodhouse <dwmw2@infradead.org>
  L:    iommu@lists.linux-foundation.org
@@@ -6961,23 -6860,35 +6961,23 @@@ M:   Deepak Saxena <dsaxena@plexity.net
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL ETHERNET DRIVERS
 -M:    Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 -L:    intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
 -W:    http://www.intel.com/support/feedback.htm
 -W:    http://e1000.sourceforge.net/
 -Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
 +INTEL MANAGEMENT ENGINE (mei)
 +M:    Tomas Winkler <tomas.winkler@intel.com>
 +L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    Documentation/networking/e100.txt
 -F:    Documentation/networking/e1000.txt
 -F:    Documentation/networking/e1000e.txt
 -F:    Documentation/networking/igb.txt
 -F:    Documentation/networking/igbvf.txt
 -F:    Documentation/networking/ixgb.txt
 -F:    Documentation/networking/ixgbe.txt
 -F:    Documentation/networking/ixgbevf.txt
 -F:    Documentation/networking/i40e.txt
 -F:    Documentation/networking/i40evf.txt
 -F:    drivers/net/ethernet/intel/
 -F:    drivers/net/ethernet/intel/*/
 -F:    include/linux/avf/virtchnl.h
 +F:    include/uapi/linux/mei.h
 +F:    include/linux/mei_cl_bus.h
 +F:    drivers/misc/mei/*
 +F:    drivers/watchdog/mei_wdt.c
 +F:    Documentation/misc-devices/mei/*
 +F:    samples/mei/*
  
 -INTEL RDMA RNIC DRIVER
 -M:     Faisal Latif <faisal.latif@intel.com>
 -M:     Shiraz Saleem <shiraz.saleem@intel.com>
 -L:     linux-rdma@vger.kernel.org
 -S:     Supported
 -F:     drivers/infiniband/hw/i40iw/
 +INTEL MENLOW THERMAL DRIVER
 +M:    Sujith Thomas <sujith.thomas@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
 +W:    https://01.org/linux-acpi
 +S:    Supported
 +F:    drivers/platform/x86/intel_menlow.c
  
  INTEL MERRIFIELD GPIO DRIVER
  M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@@ -6985,38 -6896,11 +6985,38 @@@ L:   linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-merrifield.c
  
 -INTEL-MID GPIO DRIVER
 -M:    David Cohen <david.a.cohen@linux.intel.com>
 -L:    linux-gpio@vger.kernel.org
 +INTEL MIC DRIVERS (mic)
 +M:    Sudeep Dutt <sudeep.dutt@intel.com>
 +M:    Ashutosh Dixit <ashutosh.dixit@intel.com>
 +S:    Supported
 +W:    https://github.com/sudeepdutt/mic
 +W:    http://software.intel.com/en-us/mic-developer
 +F:    include/linux/mic_bus.h
 +F:    include/linux/scif.h
 +F:    include/uapi/linux/mic_common.h
 +F:    include/uapi/linux/mic_ioctl.h
 +F:    include/uapi/linux/scif_ioctl.h
 +F:    drivers/misc/mic/
 +F:    drivers/dma/mic_x100_dma.c
 +F:    drivers/dma/mic_x100_dma.h
 +F:    Documentation/mic/
 +
 +INTEL PMC CORE DRIVER
 +M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
 +M:    Vishwanath Somayaji <vishwanath.somayaji@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/gpio/gpio-intel-mid.c
 +F:    arch/x86/include/asm/pmc_core.h
 +F:    drivers/platform/x86/intel_pmc_core*
 +
 +INTEL PMC/P-Unit IPC DRIVER
 +M:    Zha Qipeng<qipeng.zha@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/intel_pmc_ipc.c
 +F:    drivers/platform/x86/intel_punit_ipc.c
 +F:    arch/x86/include/asm/intel_pmc_ipc.h
 +F:    arch/x86/include/asm/intel_punit_ipc.h
  
  INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
  M:    Stanislav Yakovlev <stas.yakovlev@gmail.com>
@@@ -7026,32 -6910,31 +7026,32 @@@ F:   Documentation/networking/README.ipw2
  F:    Documentation/networking/README.ipw2200
  F:    drivers/net/wireless/intel/ipw2x00/
  
 -INTEL(R) TRACE HUB
 -M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +INTEL PSTATE DRIVER
 +M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 +M:    Len Brown <lenb@kernel.org>
 +L:    linux-pm@vger.kernel.org
  S:    Supported
 -F:    Documentation/trace/intel_th.txt
 -F:    drivers/hwtracing/intel_th/
 +F:    drivers/cpufreq/intel_pstate.c
  
 -INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 -M:    Ning Sun <ning.sun@intel.com>
 -L:    tboot-devel@lists.sourceforge.net
 -W:    http://tboot.sourceforge.net
 -T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 +INTEL RDMA RNIC DRIVER
 +M:    Faisal Latif <faisal.latif@intel.com>
 +M:    Shiraz Saleem <shiraz.saleem@intel.com>
 +L:    linux-rdma@vger.kernel.org
  S:    Supported
 -F:    Documentation/intel_txt.txt
 -F:    include/linux/tboot.h
 -F:    arch/x86/kernel/tboot.c
 +F:    drivers/infiniband/hw/i40iw/
  
 -INTEL WIRELESS WIMAX CONNECTION 2400
 -M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 -M:    linux-wimax@intel.com
 -L:    wimax@linuxwimax.org (subscribers-only)
 -S:    Supported
 -W:    http://linuxwimax.org
 -F:    Documentation/wimax/README.i2400m
 -F:    drivers/net/wimax/i2400m/
 -F:    include/uapi/linux/wimax/i2400m.h
 +INTEL TELEMETRY DRIVER
 +M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    arch/x86/include/asm/intel_telemetry.h
 +F:    drivers/platform/x86/intel_telemetry*
 +
 +INTEL VIRTUAL BUTTON DRIVER
 +M:    AceLan Kao <acelan.kao@canonical.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/intel-vbtn.c
  
  INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
@@@ -7070,37 -6953,56 +7070,37 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/intel/iwlwifi/
  
 -INTEL MANAGEMENT ENGINE (mei)
 -M:    Tomas Winkler <tomas.winkler@intel.com>
 -L:    linux-kernel@vger.kernel.org
 -S:    Supported
 -F:    include/uapi/linux/mei.h
 -F:    include/linux/mei_cl_bus.h
 -F:    drivers/misc/mei/*
 -F:    drivers/watchdog/mei_wdt.c
 -F:    Documentation/misc-devices/mei/*
 -F:    samples/mei/*
 -
 -INTEL MIC DRIVERS (mic)
 -M:    Sudeep Dutt <sudeep.dutt@intel.com>
 -M:    Ashutosh Dixit <ashutosh.dixit@intel.com>
 +INTEL WIRELESS WIMAX CONNECTION 2400
 +M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 +M:    linux-wimax@intel.com
 +L:    wimax@linuxwimax.org (subscribers-only)
  S:    Supported
 -W:    https://github.com/sudeepdutt/mic
 -W:    http://software.intel.com/en-us/mic-developer
 -F:    include/linux/mic_bus.h
 -F:    include/linux/scif.h
 -F:    include/uapi/linux/mic_common.h
 -F:    include/uapi/linux/mic_ioctl.h
 -F:    include/uapi/linux/scif_ioctl.h
 -F:    drivers/misc/mic/
 -F:    drivers/dma/mic_x100_dma.c
 -F:    drivers/dma/mic_x100_dma.h
 -F:    Documentation/mic/
 -
 -INTEL PMC/P-Unit IPC DRIVER
 -M:    Zha Qipeng<qipeng.zha@intel.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/intel_pmc_ipc.c
 -F:    drivers/platform/x86/intel_punit_ipc.c
 -F:    arch/x86/include/asm/intel_pmc_ipc.h
 -F:    arch/x86/include/asm/intel_punit_ipc.h
 +W:    http://linuxwimax.org
 +F:    Documentation/wimax/README.i2400m
 +F:    drivers/net/wimax/i2400m/
 +F:    include/uapi/linux/wimax/i2400m.h
  
 -INTEL TELEMETRY DRIVER
 -M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    arch/x86/include/asm/intel_telemetry.h
 -F:    drivers/platform/x86/intel_telemetry*
 +INTEL(R) TRACE HUB
 +M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +S:    Supported
 +F:    Documentation/trace/intel_th.txt
 +F:    drivers/hwtracing/intel_th/
  
 -INTEL PMC CORE DRIVER
 -M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
 -M:    Vishwanath Somayaji <vishwanath.somayaji@intel.com>
 -L:    platform-driver-x86@vger.kernel.org
 +INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 +M:    Ning Sun <ning.sun@intel.com>
 +L:    tboot-devel@lists.sourceforge.net
 +W:    http://tboot.sourceforge.net
 +T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 +S:    Supported
 +F:    Documentation/intel_txt.txt
 +F:    include/linux/tboot.h
 +F:    arch/x86/kernel/tboot.c
 +
 +INTEL-MID GPIO DRIVER
 +M:    David Cohen <david.a.cohen@linux.intel.com>
 +L:    linux-gpio@vger.kernel.org
  S:    Maintained
 -F:    arch/x86/include/asm/pmc_core.h
 -F:    drivers/platform/x86/intel_pmc_core*
 +F:    drivers/gpio/gpio-intel-mid.c
  
  INVENSENSE MPU-3050 GYROSCOPE DRIVER
  M:    Linus Walleij <linus.walleij@linaro.org>
@@@ -7146,6 -7048,13 +7146,6 @@@ F:     drivers/char/ipmi
  F:    include/linux/ipmi*
  F:    include/uapi/linux/ipmi*
  
 -QCOM AUDIO (ASoC) DRIVERS
 -M:    Patrick Lai <plai@codeaurora.org>
 -M:    Banajit Goswami <bgoswami@codeaurora.org>
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -S:    Supported
 -F:    sound/soc/qcom/
 -
  IPS SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
  L:    linux-scsi@vger.kernel.org
@@@ -7188,16 -7097,9 +7188,16 @@@ W:    http://irda.sourceforge.net
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
 -F:    drivers/net/irda/
 -F:    include/net/irda/
 -F:    net/irda/
 +F:    drivers/staging/irda/
 +
 +IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 +M:    Marc Zyngier <marc.zyngier@arm.com>
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 +F:    Documentation/IRQ-domain.txt
 +F:    include/linux/irqdomain.h
 +F:    kernel/irq/irqdomain.c
 +F:    kernel/irq/msi.c
  
  IRQ SUBSYSTEM
  M:    Thomas Gleixner <tglx@linutronix.de>
@@@ -7213,9 -7115,19 +7213,9 @@@ M:     Marc Zyngier <marc.zyngier@arm.com
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 -T:    git git://git.infradead.org/users/jcooper/linux.git irqchip/core
  F:    Documentation/devicetree/bindings/interrupt-controller/
  F:    drivers/irqchip/
  
 -IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Marc Zyngier <marc.zyngier@arm.com>
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 -F:    Documentation/IRQ-domain.txt
 -F:    include/linux/irqdomain.h
 -F:    kernel/irq/irqdomain.c
 -F:    kernel/irq/msi.c
 -
  ISA
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
  S:    Maintained
@@@ -7223,6 -7135,13 +7223,6 @@@ F:     Documentation/isa.tx
  F:    drivers/base/isa.c
  F:    include/linux/isa.h
  
 -ISAPNP
 -M:    Jaroslav Kysela <perex@perex.cz>
 -S:    Maintained
 -F:    Documentation/isapnp.txt
 -F:    drivers/pnp/isapnp/
 -F:    include/linux/isapnp.h
 -
  ISA RADIO MODULE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -7231,12 -7150,11 +7231,12 @@@ W:   https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-isa*
  
 -iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 -M:    Peter Jones <pjones@redhat.com>
 -M:    Konrad Rzeszutek Wilk <konrad@kernel.org>
 +ISAPNP
 +M:    Jaroslav Kysela <perex@perex.cz>
  S:    Maintained
 -F:    drivers/firmware/iscsi_ibft*
 +F:    Documentation/isapnp.txt
 +F:    drivers/pnp/isapnp/
 +F:    include/linux/isapnp.h
  
  ISCSI
  M:    Lee Duncan <lduncan@suse.com>
@@@ -7247,12 -7165,6 +7247,12 @@@ S:    Maintaine
  F:    drivers/scsi/*iscsi*
  F:    include/scsi/*iscsi*
  
 +iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 +M:    Peter Jones <pjones@redhat.com>
 +M:    Konrad Rzeszutek Wilk <konrad@kernel.org>
 +S:    Maintained
 +F:    drivers/firmware/iscsi_ibft*
 +
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
  M:    Or Gerlitz <ogerlitz@mellanox.com>
  M:    Sagi Grimberg <sagi@grimberg.me>
@@@ -7482,13 -7394,6 +7482,13 @@@ S:    Maintaine
  F:    tools/testing/selftests/
  F:    Documentation/dev-tools/kselftest*
  
 +KERNEL USERMODE HELPER
 +M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    kernel/umh.c
 +F:    include/linux/umh.h
 +
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Paolo Bonzini <pbonzini@redhat.com>
  M:    Radim Krčmář <rkrcmar@redhat.com>
@@@ -7496,30 -7401,18 +7496,30 @@@ L:   kvm@vger.kernel.or
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  S:    Supported
 -F:    Documentation/*/kvm*.txt
  F:    Documentation/virtual/kvm/
 -F:    arch/*/kvm/
 -F:    arch/x86/kernel/kvm.c
 -F:    arch/x86/kernel/kvmclock.c
 -F:    arch/*/include/asm/kvm*
 -F:    include/linux/kvm*
 +F:    include/trace/events/kvm.h
 +F:    include/uapi/asm-generic/kvm*
  F:    include/uapi/linux/kvm*
 -F:    virt/kvm/
 +F:    include/asm-generic/kvm*
 +F:    include/linux/kvm*
 +F:    include/kvm/iodev.h
 +F:    virt/kvm/*
  F:    tools/kvm/
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
 +KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 +M:    Paolo Bonzini <pbonzini@redhat.com>
 +M:    Radim KrÄmář <rkrcmar@redhat.com>
 +L:    kvm@vger.kernel.org
 +W:    http://www.linux-kvm.org
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +S:    Supported
 +F:    arch/x86/kvm/
 +F:    arch/x86/include/uapi/asm/kvm*
 +F:    arch/x86/include/asm/kvm*
 +F:    arch/x86/kernel/kvm.c
 +F:    arch/x86/kernel/kvmclock.c
 +
 +KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
  M:    Joerg Roedel <joro@8bytes.org>
  L:    kvm@vger.kernel.org
  W:    http://www.linux-kvm.org/
@@@ -7527,7 -7420,28 +7527,7 @@@ S:     Maintaine
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/kvm/svm.c
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 -M:    Alexander Graf <agraf@suse.com>
 -L:    kvm-ppc@vger.kernel.org
 -W:    http://www.linux-kvm.org/
 -T:    git git://github.com/agraf/linux-2.6.git
 -S:    Supported
 -F:    arch/powerpc/include/asm/kvm*
 -F:    arch/powerpc/kvm/
 -
 -KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 -M:    Christian Borntraeger <borntraeger@de.ibm.com>
 -M:    Cornelia Huck <cohuck@redhat.com>
 -L:    linux-s390@vger.kernel.org
 -W:    http://www.ibm.com/developerworks/linux/linux390/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 -S:    Supported
 -F:    Documentation/s390/kvm.txt
 -F:    arch/s390/include/asm/kvm*
 -F:    arch/s390/kvm/
 -F:    arch/s390/mm/gmap.c
 -
 -KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 +KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
  M:    Christoffer Dall <christoffer.dall@linaro.org>
  M:    Marc Zyngier <marc.zyngier@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -7541,17 -7455,6 +7541,17 @@@ F:    arch/arm/kvm
  F:    virt/kvm/arm/
  F:    include/kvm/arm_*
  
 +KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
 +M:    Alexander Graf <agraf@suse.com>
 +L:    kvm-ppc@vger.kernel.org
 +W:    http://www.linux-kvm.org/
 +T:    git git://github.com/agraf/linux-2.6.git
 +S:    Supported
 +F:    arch/powerpc/include/uapi/asm/kvm*
 +F:    arch/powerpc/include/asm/kvm*
 +F:    arch/powerpc/kvm/
 +F:    arch/powerpc/kernel/kvm*
 +
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Christoffer Dall <christoffer.dall@linaro.org>
  M:    Marc Zyngier <marc.zyngier@arm.com>
@@@ -7570,19 -7473,6 +7570,19 @@@ F:    arch/mips/include/uapi/asm/kvm
  F:    arch/mips/include/asm/kvm*
  F:    arch/mips/kvm/
  
 +KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 +M:    Christian Borntraeger <borntraeger@de.ibm.com>
 +M:    Cornelia Huck <cohuck@redhat.com>
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 +S:    Supported
 +F:    arch/s390/include/uapi/asm/kvm*
 +F:    arch/s390/include/asm/gmap.h
 +F:    arch/s390/include/asm/kvm*
 +F:    arch/s390/kvm/
 +F:    arch/s390/mm/gmap.c
 +
  KERNFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Tejun Heo <tj@kernel.org>
@@@ -7600,15 -7490,17 +7600,15 @@@ F:   include/linux/kexec.
  F:    include/uapi/linux/kexec.h
  F:    kernel/kexec*
  
 -KEYS/KEYRINGS:
 -M:    David Howells <dhowells@redhat.com>
 +KEYS-ENCRYPTED
 +M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +M:    David Safford <safford@us.ibm.com>
 +L:    linux-security-module@vger.kernel.org
  L:    keyrings@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/security/keys/core.rst
 -F:    include/linux/key.h
 -F:    include/linux/key-type.h
 -F:    include/linux/keyctl.h
 -F:    include/uapi/linux/keyctl.h
 -F:    include/keys/
 -F:    security/keys/
 +S:    Supported
 +F:    Documentation/security/keys/trusted-encrypted.rst
 +F:    include/keys/encrypted-type.h
 +F:    security/keys/encrypted-keys/
  
  KEYS-TRUSTED
  M:    David Safford <safford@us.ibm.com>
@@@ -7621,17 -7513,15 +7621,17 @@@ F:   include/keys/trusted-type.
  F:    security/keys/trusted.c
  F:    security/keys/trusted.h
  
 -KEYS-ENCRYPTED
 -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 -M:    David Safford <safford@us.ibm.com>
 -L:    linux-security-module@vger.kernel.org
 +KEYS/KEYRINGS:
 +M:    David Howells <dhowells@redhat.com>
  L:    keyrings@vger.kernel.org
 -S:    Supported
 -F:    Documentation/security/keys/trusted-encrypted.rst
 -F:    include/keys/encrypted-type.h
 -F:    security/keys/encrypted-keys/
 +S:    Maintained
 +F:    Documentation/security/keys/core.rst
 +F:    include/linux/key.h
 +F:    include/linux/key-type.h
 +F:    include/linux/keyctl.h
 +F:    include/uapi/linux/keyctl.h
 +F:    include/keys/
 +F:    security/keys/
  
  KGDB / KDB /debug_core
  M:    Jason Wessel <jason.wessel@windriver.com>
@@@ -7664,7 -7554,7 +7664,7 @@@ F:      include/linux/kmemleak.
  F:    mm/kmemleak.c
  F:    mm/kmemleak-test.c
  
 -KMOD MODULE USERMODE HELPER
 +KMOD KERNEL MODULE LOADER - USERMODE HELPER
  M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
@@@ -7764,6 -7654,27 +7764,6 @@@ T:     git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/dvb-frontends/lgdt3305.*
  
 -LGUEST
 -M:    Rusty Russell <rusty@rustcorp.com.au>
 -L:    lguest@lists.ozlabs.org
 -W:    http://lguest.ozlabs.org/
 -S:    Odd Fixes
 -F:    arch/x86/include/asm/lguest*.h
 -F:    arch/x86/lguest/
 -F:    drivers/lguest/
 -F:    include/linux/lguest*.h
 -F:    tools/lguest/
 -
 -LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 -M:    Tejun Heo <tj@kernel.org>
 -L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 -S:    Maintained
 -F:    drivers/ata/
 -F:    include/linux/ata.h
 -F:    include/linux/libata.h
 -F:    Documentation/devicetree/bindings/ata/
 -
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <vireshk@kernel.org>
  L:    linux-ide@vger.kernel.org
@@@ -7807,27 -7718,21 +7807,27 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/ata/sata_promise.*
  
 +LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 +M:    Tejun Heo <tj@kernel.org>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/
 +F:    include/linux/ata.h
 +F:    include/linux/libata.h
 +F:    Documentation/devicetree/bindings/ata/
 +
  LIBLOCKDEP
  M:    Sasha Levin <alexander.levin@verizon.com>
  S:    Maintained
  F:    tools/lib/lockdep/
  
 -LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 -M:    Dan Williams <dan.j.williams@intel.com>
 -L:    linux-nvdimm@lists.01.org
 -Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
 -S:    Supported
 -F:    drivers/nvdimm/*
 -F:    include/linux/nd.h
 -F:    include/linux/libnvdimm.h
 -F:    include/uapi/linux/ndctl.h
 +HMM - Heterogeneous Memory Management
 +M:    Jérôme Glisse <jglisse@redhat.com>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    mm/hmm*
 +F:    include/linux/hmm*
  
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
  M:    Ross Zwisler <ross.zwisler@linux.intel.com>
@@@ -7836,6 -7741,7 +7836,6 @@@ Q:      https://patchwork.kernel.org/project
  S:    Supported
  F:    drivers/nvdimm/blk.c
  F:    drivers/nvdimm/region_devs.c
 -F:    drivers/acpi/nfit*
  
  LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
  M:    Vishal Verma <vishal.l.verma@intel.com>
@@@ -7851,18 -7757,6 +7851,18 @@@ Q:    https://patchwork.kernel.org/project
  S:    Supported
  F:    drivers/nvdimm/pmem*
  
 +LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 +M:    Dan Williams <dan.j.williams@intel.com>
 +L:    linux-nvdimm@lists.01.org
 +Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
 +S:    Supported
 +F:    drivers/nvdimm/*
 +F:    drivers/acpi/nfit/*
 +F:    include/linux/nd.h
 +F:    include/linux/libnvdimm.h
 +F:    include/uapi/linux/ndctl.h
 +
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <mb@lightnvm.io>
  W:    http://github/OpenChannelSSD
@@@ -7872,14 -7766,6 +7872,14 @@@ F:    drivers/lightnvm
  F:    include/linux/lightnvm.h
  F:    include/uapi/linux/lightnvm.h
  
 +LINUX FOR POWER MACINTOSH
 +M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 +W:    http://www.penguinppc.org/
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Maintained
 +F:    arch/powerpc/platforms/powermac/
 +F:    drivers/macintosh/
 +
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
  M:    Paul Mackerras <paulus@samba.org>
@@@ -7906,7 -7792,6 +7906,7 @@@ F:      drivers/pci/hotplug/rpa
  F:    drivers/rtc/rtc-opal.c
  F:    drivers/scsi/ibmvscsi/
  F:    drivers/tty/hvc/hvc_opal.c
 +F:    drivers/watchdog/wdrtas.c
  F:    tools/testing/selftests/powerpc
  N:    /pmac
  N:    powermac
@@@ -7914,6 -7799,14 +7914,6 @@@ N:     powern
  N:    [^a-z0-9]ps3
  N:    pseries
  
 -LINUX FOR POWER MACINTOSH
 -M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 -W:    http://www.penguinppc.org/
 -L:    linuxppc-dev@lists.ozlabs.org
 -S:    Maintained
 -F:    arch/powerpc/platforms/powermac/
 -F:    drivers/macintosh/
 -
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Anatolij Gustschin <agust@denx.de>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -7931,6 -7824,19 +7931,6 @@@ S:     Maintaine
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
  
 -LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 -L:    linuxppc-dev@lists.ozlabs.org
 -S:    Orphan
 -F:    arch/powerpc/*/*virtex*
 -F:    arch/powerpc/*/*/*virtex*
 -
 -LINUX FOR POWERPC EMBEDDED PPC8XX
 -M:    Vitaly Bordug <vitb@kernel.crashing.org>
 -W:    http://www.penguinppc.org/
 -L:    linuxppc-dev@lists.ozlabs.org
 -S:    Maintained
 -F:    arch/powerpc/platforms/8xx/
 -
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
  M:    Scott Wood <oss@buserror.net>
  M:    Kumar Gala <galak@kernel.crashing.org>
@@@ -7942,19 -7848,6 +7942,19 @@@ F:    arch/powerpc/platforms/83xx
  F:    arch/powerpc/platforms/85xx/
  F:    Documentation/devicetree/bindings/powerpc/fsl/
  
 +LINUX FOR POWERPC EMBEDDED PPC8XX
 +M:    Vitaly Bordug <vitb@kernel.crashing.org>
 +W:    http://www.penguinppc.org/
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Maintained
 +F:    arch/powerpc/platforms/8xx/
 +
 +LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Orphan
 +F:    arch/powerpc/*/*virtex*
 +F:    arch/powerpc/*/*/*virtex*
 +
  LINUX FOR POWERPC PA SEMI PWRFICIENT
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Orphan
@@@ -7962,11 -7855,6 +7962,11 @@@ F:    arch/powerpc/platforms/pasemi
  F:    drivers/*/*pasemi*
  F:    drivers/*/*/*pasemi*
  
 +LINUX KERNEL DUMP TEST MODULE (LKDTM)
 +M:    Kees Cook <keescook@chromium.org>
 +S:    Maintained
 +F:    drivers/misc/lkdtm*
 +
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <chrisw@sous-sol.org>
  L:    linux-security-module@vger.kernel.org
@@@ -7996,6 -7884,11 +7996,6 @@@ F:     samples/livepatch
  L:    live-patching@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
  
 -LINUX KERNEL DUMP TEST MODULE (LKDTM)
 -M:    Kees Cook <keescook@chromium.org>
 -S:    Maintained
 -F:    drivers/misc/lkdtm*
 -
  LLC (802.2)
  L:    netdev@vger.kernel.org
  S:    Odd fixes
@@@ -8048,13 -7941,6 +8048,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/lmedm04*
  
 +LOADPIN SECURITY MODULE
 +M:    Kees Cook <keescook@chromium.org>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
 +S:    Supported
 +F:    security/loadpin/
 +F:    Documentation/admin-guide/LSM/LoadPin.rst
 +
  LOCKING PRIMITIVES
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
@@@ -8345,6 -8231,14 +8345,6 @@@ S:     Maintaine
  F:    Documentation/devicetree/bindings/sound/max9860.txt
  F:    sound/soc/codecs/max9860.*
  
 -MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 -M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 -L:    linux-pm@vger.kernel.org
 -S:    Supported
 -F:    drivers/power/supply/max14577_charger.c
 -F:    drivers/power/supply/max77693_charger.c
 -
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-kernel@vger.kernel.org
@@@ -8353,14 -8247,6 +8353,14 @@@ F:    drivers/regulator/max77802-regulator
  F:    Documentation/devicetree/bindings/*/*max77802.txt
  F:    include/dt-bindings/*/*max77802.h
  
 +MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Supported
 +F:    drivers/power/supply/max14577_charger.c
 +F:    drivers/power/supply/max77693_charger.c
 +
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
@@@ -8403,25 -8289,14 +8403,25 @@@ L:   linux-iio@vger.kernel.or
  S:    Maintained
  F:    drivers/iio/dac/cio-dac.c
  
 -MEDIA DRIVERS FOR RENESAS - DRIF
 -M:    Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 +MEDIA DRIVERS FOR ASCOT2E
 +M:    Sergey Kozlov <serjk@netup.ru>
 +M:    Abylay Ospan <aospan@netup.ru>
  L:    linux-media@vger.kernel.org
 -L:    linux-renesas-soc@vger.kernel.org
 +W:    https://linuxtv.org
 +W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/renesas,drif.txt
 -F:    drivers/media/platform/rcar_drif.c
 +F:    drivers/media/dvb-frontends/ascot2e*
 +
 +MEDIA DRIVERS FOR CXD2841ER
 +M:    Sergey Kozlov <serjk@netup.ru>
 +M:    Abylay Ospan <aospan@netup.ru>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/cxd2841er*
  
  MEDIA DRIVERS FOR FREESCALE IMX
  M:    Steve Longerbeam <slongerbeam@gmail.com>
@@@ -8435,62 -8310,6 +8435,62 @@@ F:    drivers/staging/media/imx
  F:    include/linux/imx-media.h
  F:    include/media/imx.h
  
 +MEDIA DRIVERS FOR HELENE
 +M:    Abylay Ospan <aospan@netup.ru>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/helene*
 +
 +MEDIA DRIVERS FOR HORUS3A
 +M:    Sergey Kozlov <serjk@netup.ru>
 +M:    Abylay Ospan <aospan@netup.ru>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/horus3a*
 +
 +MEDIA DRIVERS FOR LNBH25
 +M:    Sergey Kozlov <serjk@netup.ru>
 +M:    Abylay Ospan <aospan@netup.ru>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/lnbh25*
 +
 +MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/mxl5xx*
 +
 +MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
 +M:    Sergey Kozlov <serjk@netup.ru>
 +M:    Abylay Ospan <aospan@netup.ru>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/pci/netup_unidvb/*
 +
 +MEDIA DRIVERS FOR RENESAS - DRIF
 +M:    Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 +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,drif.txt
 +F:    drivers/media/platform/rcar_drif.c
 +
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -8528,29 -8347,64 +8528,29 @@@ S:   Supporte
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
  F:    drivers/media/platform/vsp1/
  
 -MEDIA DRIVERS FOR HELENE
 -M:    Abylay Ospan <aospan@netup.ru>
 -L:    linux-media@vger.kernel.org
 -W:    https://linuxtv.org
 -W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    drivers/media/dvb-frontends/helene*
 -
 -MEDIA DRIVERS FOR ASCOT2E
 -M:    Sergey Kozlov <serjk@netup.ru>
 -M:    Abylay Ospan <aospan@netup.ru>
 -L:    linux-media@vger.kernel.org
 -W:    https://linuxtv.org
 -W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    drivers/media/dvb-frontends/ascot2e*
 -
 -MEDIA DRIVERS FOR CXD2841ER
 -M:    Sergey Kozlov <serjk@netup.ru>
 -M:    Abylay Ospan <aospan@netup.ru>
 -L:    linux-media@vger.kernel.org
 -W:    https://linuxtv.org
 -W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    drivers/media/dvb-frontends/cxd2841er*
 -
 -MEDIA DRIVERS FOR HORUS3A
 -M:    Sergey Kozlov <serjk@netup.ru>
 -M:    Abylay Ospan <aospan@netup.ru>
 +MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
  L:    linux-media@vger.kernel.org
  W:    https://linuxtv.org
 -W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    drivers/media/dvb-frontends/horus3a*
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv0910*
  
 -MEDIA DRIVERS FOR LNBH25
 -M:    Sergey Kozlov <serjk@netup.ru>
 -M:    Abylay Ospan <aospan@netup.ru>
 +MEDIA DRIVERS FOR ST STV6111 TUNER ICs
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
  L:    linux-media@vger.kernel.org
  W:    https://linuxtv.org
 -W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    drivers/media/dvb-frontends/lnbh25*
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv6111*
  
 -MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
 -M:    Sergey Kozlov <serjk@netup.ru>
 -M:    Abylay Ospan <aospan@netup.ru>
 +MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
  L:    linux-media@vger.kernel.org
  W:    https://linuxtv.org
 -W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    drivers/media/pci/netup_unidvb/*
 +S:    Maintained
 +F:    drivers/media/pci/ddbridge/*
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
@@@ -8577,9 -8431,7 +8577,9 @@@ F:      include/uapi/linux/uvcvideo.
  
  MEDIATEK ETHERNET DRIVER
  M:    Felix Fietkau <nbd@openwrt.org>
 -M:    John Crispin <blogic@openwrt.org>
 +M:    John Crispin <john@phrozen.org>
 +M:    Sean Wang <sean.wang@mediatek.com>
 +M:    Nelson Chang <nelson.chang@mediatek.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
@@@ -8591,6 -8443,15 +8591,6 @@@ S:     Supporte
  F:    drivers/media/platform/mtk-jpeg/
  F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
  
 -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>
@@@ -8600,38 -8461,16 +8600,38 @@@ F:   drivers/media/platform/mtk-mdp
  F:    drivers/media/platform/mtk-vpu/
  F:    Documentation/devicetree/bindings/media/mediatek-mdp.txt
  
 +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 MT7601U WIRELESS LAN DRIVER
  M:    Jakub Kicinski <kubakici@wp.pl>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK CIR DRIVER
 +M:    Sean Wang <sean.wang@mediatek.com>
 +S:    Maintained
 +F:    drivers/media/rc/mtk-cir.c
 +
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
 -M:      Sean Wang <sean.wang@mediatek.com>
 -S:      Maintained
 -F:      drivers/char/hw_random/mtk-rng.c
 +M:    Sean Wang <sean.wang@mediatek.com>
 +S:    Maintained
 +F:    drivers/char/hw_random/mtk-rng.c
 +
 +MEDIATEK USB3 DRD IP DRIVER
 +M:    Chunfeng Yun <chunfeng.yun@mediatek.com>
 +L:    linux-usb@vger.kernel.org (moderated for non-subscribers)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <peter.senna@collabora.com>
@@@ -8653,13 -8492,6 +8653,13 @@@ F:    Documentation/scsi/megaraid.tx
  F:    drivers/scsi/megaraid.*
  F:    drivers/scsi/megaraid/
  
 +MELEXIS MLX90614 DRIVER
 +M:    Crt Mori <cmo@melexis.com>
 +L:    linux-iio@vger.kernel.org
 +W:    http://www.melexis.com
 +S:    Supported
 +F:    drivers/iio/temperature/mlx90614.c
 +
  MELFAS MIP4 TOUCHSCREEN DRIVER
  M:    Sangwon Jee <jeesw@melfas.com>
  W:    http://www.melfas.com
@@@ -8720,56 -8552,6 +8720,56 @@@ W:    http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxfw/
  
 +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
 +
 +MELLANOX MLX4 core VPI driver
 +M:    Tariq Toukan <tariqt@mellanox.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +S:    Supported
 +F:    drivers/net/ethernet/mellanox/mlx4/
 +F:    include/linux/mlx4/
 +
 +MELLANOX MLX4 IB driver
 +M:    Yishai Hadas <yishaih@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 +S:    Supported
 +F:    drivers/infiniband/hw/mlx4/
 +F:    include/linux/mlx4/
 +F:    include/uapi/rdma/mlx4-abi.h
 +
 +MELLANOX MLX5 core VPI driver
 +M:    Saeed Mahameed <saeedm@mellanox.com>
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +S:    Supported
 +F:    drivers/net/ethernet/mellanox/mlx5/core/
 +F:    include/linux/mlx5/
 +
 +MELLANOX MLX5 IB driver
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 +S:    Supported
 +F:    drivers/infiniband/hw/mlx5/
 +F:    include/linux/mlx5/
 +F:    include/uapi/rdma/mlx5-abi.h
 +
  MELLANOX MLXCPLD I2C AND MUX DRIVER
  M:    Vadim Pasternak <vadimp@mellanox.com>
  M:    Michael Shych <michaelsh@mellanox.com>
@@@ -8787,17 -8569,33 +8787,17 @@@ F:   drivers/leds/leds-mlxcpld.
  F:    Documentation/leds/leds-mlxcpld.txt
  
  MELLANOX PLATFORM DRIVER
 -M:      Vadim Pasternak <vadimp@mellanox.com>
 -L:      platform-driver-x86@vger.kernel.org
 -S:      Supported
 -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>
 -L:    linux-rdma@vger.kernel.org
 -S:    Supported
 -W:    https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
 -Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -F:    drivers/infiniband/sw/rxe/
 -F:    include/uapi/rdma/rdma_user_rxe.h
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Supported
 +F:    drivers/platform/x86/mlx-platform.c
  
  MEMBARRIER SUPPORT
  M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    kernel/membarrier.c
 +F:    kernel/sched/membarrier.c
  F:    include/uapi/linux/membarrier.h
  
  MEMORY MANAGEMENT
@@@ -8851,16 -8649,6 +8851,16 @@@ F:    drivers/leds/leds-menf21bmc.
  F:    drivers/hwmon/menf21bmc_hwmon.c
  F:    Documentation/hwmon/menf21bmc
  
 +MESON AO CEC DRIVER FOR AMLOGIC SOCS
 +M:    Neil Armstrong <narmstrong@baylibre.com>
 +L:    linux-media@lists.freedesktop.org
 +L:    linux-amlogic@lists.infradead.org
 +W:    http://linux-meson.com/
 +S:    Supported
 +F:    drivers/media/platform/meson/ao-cec.c
 +F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
 +T:    git git://linuxtv.org/media_tree.git
 +
  METAG ARCHITECTURE
  M:    James Hogan <james.hogan@imgtec.com>
  L:    linux-metag@vger.kernel.org
@@@ -8897,12 -8685,6 +8897,12 @@@ F:    drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
  
 +MICROCHIP / ATMEL ECC DRIVER
 +M:    Tudor Ambarus <tudor.ambarus@microchip.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/atmel-ecc.*
 +
  MICROCHIP / ATMEL ISC DRIVER
  M:    Songjun Wu <songjun.wu@microchip.com>
  L:    linux-media@vger.kernel.org
@@@ -8928,18 -8710,6 +8928,18 @@@ S:    Maintaine
  F:    drivers/usb/misc/usb251xb.c
  F:    Documentation/devicetree/bindings/usb/usb251xb.txt
  
 +MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 +M:    Don Brace <don.brace@microsemi.com>
 +L:    esc.storagedev@microsemi.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/smartpqi/smartpqi*.[ch]
 +F:    drivers/scsi/smartpqi/Kconfig
 +F:    drivers/scsi/smartpqi/Makefile
 +F:    include/linux/cciss*.h
 +F:    include/uapi/linux/cciss*.h
 +F:    Documentation/scsi/smartpqi.txt
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <yu.c.chen@intel.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -8962,16 -8732,6 +8962,16 @@@ F:    Documentation/devicetree/bindings/mi
  F:    Documentation/mips/
  F:    arch/mips/
  
 +MIPS BOSTON DEVELOPMENT BOARD
 +M:    Paul Burton <paul.burton@imgtec.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/img,boston-clock.txt
 +F:    arch/mips/boot/dts/img/boston.dts
 +F:    arch/mips/configs/generic/board-boston.config
 +F:    drivers/clk/imgtec/clk-boston.c
 +F:    include/dt-bindings/clock/boston-clock.h
 +
  MIPS GENERIC PLATFORM
  M:    Paul Burton <paul.burton@imgtec.com>
  L:    linux-mips@linux-mips.org
@@@ -8987,6 -8747,16 +8987,6 @@@ F:     arch/mips/include/asm/mach-loongson3
  F:    drivers/*/*loongson1*
  F:    drivers/*/*/*loongson1*
  
 -MIPS BOSTON DEVELOPMENT BOARD
 -M:    Paul Burton <paul.burton@imgtec.com>
 -L:    linux-mips@linux-mips.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/clock/img,boston-clock.txt
 -F:    arch/mips/boot/dts/img/boston.dts
 -F:    arch/mips/configs/generic/board-boston.config
 -F:    drivers/clk/imgtec/clk-boston.c
 -F:    include/dt-bindings/clock/boston-clock.h
 -
  MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -8995,15 -8765,67 +8995,15 @@@ W:   https://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/radio/radio-miropcm20*
  
 -MELLANOX MLX4 core VPI driver
 -M:    Tariq Toukan <tariqt@mellanox.com>
 -L:    netdev@vger.kernel.org
 -L:    linux-rdma@vger.kernel.org
 -W:    http://www.mellanox.com
 -Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -S:    Supported
 -F:    drivers/net/ethernet/mellanox/mlx4/
 -F:    include/linux/mlx4/
 -
 -MELLANOX MLX4 IB driver
 -M:    Yishai Hadas <yishaih@mellanox.com>
 -L:    linux-rdma@vger.kernel.org
 -W:    http://www.mellanox.com
 -Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -S:    Supported
 -F:    drivers/infiniband/hw/mlx4/
 -F:    include/linux/mlx4/
 -F:    include/uapi/rdma/mlx4-abi.h
 -
 -MELLANOX MLX5 core VPI driver
 -M:    Saeed Mahameed <saeedm@mellanox.com>
 -M:    Matan Barak <matanb@mellanox.com>
 -M:    Leon Romanovsky <leonro@mellanox.com>
 -L:    netdev@vger.kernel.org
 -L:    linux-rdma@vger.kernel.org
 -W:    http://www.mellanox.com
 -Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -S:    Supported
 -F:    drivers/net/ethernet/mellanox/mlx5/core/
 -F:    include/linux/mlx5/
 -
 -MELLANOX MLX5 IB driver
 -M:    Matan Barak <matanb@mellanox.com>
 -M:    Leon Romanovsky <leonro@mellanox.com>
 -L:    linux-rdma@vger.kernel.org
 -W:    http://www.mellanox.com
 -Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -S:    Supported
 -F:    drivers/infiniband/hw/mlx5/
 -F:    include/linux/mlx5/
 -F:    include/uapi/rdma/mlx5-abi.h
 -
 -MELEXIS MLX90614 DRIVER
 -M:    Crt Mori <cmo@melexis.com>
 -L:    linux-iio@vger.kernel.org
 -W:    http://www.melexis.com
 -S:    Supported
 -F:    drivers/iio/temperature/mlx90614.c
 -
 -MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 -L:    linux-scsi@vger.kernel.org
 -S:    Supported
 -F:    drivers/scsi/smartpqi/smartpqi*.[ch]
 -F:    drivers/scsi/smartpqi/Kconfig
 -F:    drivers/scsi/smartpqi/Makefile
 -F:    include/linux/cciss*.h
 -F:    include/uapi/linux/cciss*.h
 -F:    Documentation/scsi/smartpqi.txt
 +MMP SUPPORT
 +M:    Eric Miao <eric.y.miao@gmail.com>
 +M:    Haojian Zhuang <haojian.zhuang@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://github.com/hzhuang1/linux.git
 +T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
 +S:    Maintained
 +F:    arch/arm/boot/dts/mmp*
 +F:    arch/arm/mach-mmp/
  
  MN88472 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
@@@ -9137,11 -8959,6 +9137,11 @@@ F:    drivers/mfd
  F:    include/linux/mfd/
  F:    include/dt-bindings/mfd/
  
 +MULTIMEDIA CARD (MMC) ETC. OVER SPI
 +S:    Orphan
 +F:    drivers/mmc/host/mmc_spi.c
 +F:    include/linux/spi/mmc_spi.h
 +
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  M:    Ulf Hansson <ulf.hansson@linaro.org>
  L:    linux-mmc@vger.kernel.org
@@@ -9152,6 -8969,11 +9152,6 @@@ F:     drivers/mmc
  F:    include/linux/mmc/
  F:    include/uapi/linux/mmc/
  
 -MULTIMEDIA CARD (MMC) ETC. OVER SPI
 -S:    Orphan
 -F:    drivers/mmc/host/mmc_spi.c
 -F:    include/linux/spi/mmc_spi.h
 -
  MULTIPLEXER SUBSYSTEM
  M:    Peter Rosin <peda@axentia.se>
  S:    Maintained
@@@ -9212,7 -9034,11 +9212,7 @@@ T:     git git://git.infradead.org/linux-mt
  T:    git git://git.infradead.org/l2-mtd.git nand/next
  S:    Maintained
  F:    drivers/mtd/nand/
 -F:    include/linux/mtd/nand*.h
 -
 -NATSEMI ETHERNET DRIVER (DP8381x)
 -S:    Orphan
 -F:    drivers/net/ethernet/natsemi/natsemi.c
 +F:    include/linux/mtd/*nand*.h
  
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <zonque@gmail.com>
@@@ -9221,10 -9047,6 +9221,10 @@@ L:    alsa-devel@alsa-project.org (moderat
  W:    http://www.native-instruments.com
  F:    sound/usb/caiaq/
  
 +NATSEMI ETHERNET DRIVER (DP8381x)
 +S:    Orphan
 +F:    drivers/net/ethernet/natsemi/natsemi.c
 +
  NCP FILESYSTEM
  M:    Petr Vandrovec <petr@vandrovec.name>
  S:    Odd Fixes
@@@ -9304,6 -9126,15 +9304,6 @@@ F:     net/*/netfilter
  F:    net/netfilter/
  F:    net/bridge/br_netfilter*.c
  
 -NETLABEL
 -M:    Paul Moore <paul@paul-moore.com>
 -W:    http://netlabel.sf.net
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/netlabel/
 -F:    include/net/netlabel.h
 -F:    net/netlabel/
 -
  NETROM NETWORK LAYER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-hams@vger.kernel.org
@@@ -9335,35 -9166,6 +9335,35 @@@ S:    Maintaine
  W:    https://fedorahosted.org/dropwatch/
  F:    net/core/drop_monitor.c
  
 +NETWORKING DRIVERS
 +L:    netdev@vger.kernel.org
 +W:    http://www.linuxfoundation.org/en/Net
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 +S:    Odd Fixes
 +F:    Documentation/devicetree/bindings/net/
 +F:    drivers/net/
 +F:    include/linux/if_*
 +F:    include/linux/netdevice.h
 +F:    include/linux/etherdevice.h
 +F:    include/linux/fcdevice.h
 +F:    include/linux/fddidevice.h
 +F:    include/linux/hippidevice.h
 +F:    include/linux/inetdevice.h
 +F:    include/uapi/linux/if_*
 +F:    include/uapi/linux/netdevice.h
 +
 +NETWORKING DRIVERS (WIRELESS)
 +M:    Kalle Valo <kvalo@codeaurora.org>
 +L:    linux-wireless@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/wireless/
 +F:    drivers/net/wireless/
 +
  NETWORKING [DSA]
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
@@@ -9395,6 -9197,28 +9395,6 @@@ F:     tools/net
  F:    tools/testing/selftests/net/
  F:    lib/random32.c
  
 -NETWORKING [IPv4/IPv6]
 -M:    "David S. Miller" <davem@davemloft.net>
 -M:    Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
 -M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
 -L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 -S:    Maintained
 -F:    net/ipv4/
 -F:    net/ipv6/
 -F:    include/net/ip*
 -F:    arch/x86/net/*
 -
 -NETWORKING [TLS]
 -M:    Ilya Lesokhin <ilyal@mellanox.com>
 -M:    Aviad Yehezkel <aviadye@mellanox.com>
 -M:    Dave Watson <davejwatson@fb.com>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    net/tls/*
 -F:    include/uapi/linux/tls.h
 -F:    include/net/tls.h
 -
  NETWORKING [IPSEC]
  M:    Steffen Klassert <steffen.klassert@secunet.com>
  M:    Herbert Xu <herbert@gondor.apana.org.au>
@@@ -9419,49 -9243,43 +9419,49 @@@ F:   net/ipv6/ip6_vti.
  F:    include/uapi/linux/xfrm.h
  F:    include/net/xfrm.h
  
 -NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
 -M:    Paul Moore <paul@paul-moore.com>
 +NETWORKING [IPv4/IPv6]
 +M:    "David S. Miller" <davem@davemloft.net>
 +M:    Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
 +M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
  L:    netdev@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
  S:    Maintained
 +F:    net/ipv4/
 +F:    net/ipv6/
 +F:    include/net/ip*
 +F:    arch/x86/net/*
  
 -NETWORKING [WIRELESS]
 -L:    linux-wireless@vger.kernel.org
 -Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 +NETWORKING [LABELED] (NetLabel, Labeled IPsec, SECMARK)
 +M:    Paul Moore <paul@paul-moore.com>
 +W:    https://github.com/netlabel
 +L:    netdev@vger.kernel.org
 +L:    linux-security-module@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/netlabel/
 +F:    include/net/calipso.h
 +F:    include/net/cipso_ipv4.h
 +F:    include/net/netlabel.h
 +F:    include/uapi/linux/netfilter/xt_SECMARK.h
 +F:    include/uapi/linux/netfilter/xt_CONNSECMARK.h
 +F:    net/netlabel/
 +F:    net/ipv4/cipso_ipv4.c
 +F:    net/ipv6/calipso.c
 +F:    net/netfilter/xt_CONNSECMARK.c
 +F:    net/netfilter/xt_SECMARK.c
  
 -NETWORKING DRIVERS
 +NETWORKING [TLS]
 +M:    Ilya Lesokhin <ilyal@mellanox.com>
 +M:    Aviad Yehezkel <aviadye@mellanox.com>
 +M:    Dave Watson <davejwatson@fb.com>
  L:    netdev@vger.kernel.org
 -W:    http://www.linuxfoundation.org/en/Net
 -Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 -S:    Odd Fixes
 -F:    Documentation/devicetree/bindings/net/
 -F:    drivers/net/
 -F:    include/linux/if_*
 -F:    include/linux/netdevice.h
 -F:    include/linux/etherdevice.h
 -F:    include/linux/fcdevice.h
 -F:    include/linux/fddidevice.h
 -F:    include/linux/hippidevice.h
 -F:    include/linux/inetdevice.h
 -F:    include/uapi/linux/if_*
 -F:    include/uapi/linux/netdevice.h
 +S:    Maintained
 +F:    net/tls/*
 +F:    include/uapi/linux/tls.h
 +F:    include/net/tls.h
  
 -NETWORKING DRIVERS (WIRELESS)
 -M:    Kalle Valo <kvalo@codeaurora.org>
 +NETWORKING [WIRELESS]
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/net/wireless/
 -F:    drivers/net/wireless/
  
  NETXEN (1/10) GbE SUPPORT
  M:    Manish Chopra <manish.chopra@cavium.com>
@@@ -9555,6 -9373,14 +9555,6 @@@ S:     Maintaine
  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
@@@ -9566,12 -9392,6 +9566,12 @@@ F:    drivers/power/supply/bq27xxx_battery
  F:    drivers/power/supply/isp1704_charger.c
  F:    drivers/power/supply/rx51_battery.c
  
 +NTB AMD DRIVER
 +M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 +L:    linux-ntb@googlegroups.com
 +S:    Supported
 +F:    drivers/ntb/hw/amd/
 +
  NTB DRIVER CORE
  M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
@@@ -9601,6 -9421,12 +9601,6 @@@ W:     https://github.com/jonmason/ntb/wik
  T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/hw/intel/
  
 -NTB AMD DRIVER
 -M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 -L:    linux-ntb@googlegroups.com
 -S:    Supported
 -F:    drivers/ntb/hw/amd/
 -
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
@@@ -9630,6 -9456,15 +9630,6 @@@ 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
@@@ -9640,24 -9475,21 +9640,24 @@@ F:   drivers/nvme/host/fc.
  F:    drivers/nvme/target/fc.c
  F:    drivers/nvme/target/fcloop.c
  
 +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/
 +
  NVMEM FRAMEWORK
  M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  S:    Maintained
  F:    drivers/nvmem/
  F:    Documentation/devicetree/bindings/nvmem/
 +F:    Documentation/ABI/stable/sysfs-bus-nvmem
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 -NXP-NCI NFC DRIVER
 -M:    Clément Perrochaud <clement.perrochaud@effinnov.com>
 -R:    Charles Gorand <charles.gorand@effinnov.com>
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/nfc/nxp-nci
 -
  NXP TDA998X DRM DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  S:    Supported
@@@ -9672,31 -9504,55 +9672,31 @@@ L:   alsa-devel@alsa-project.org (moderat
  S:    Maintained
  F:    sound/soc/codecs/tfa9879*
  
 +NXP-NCI NFC DRIVER
 +M:    Clément Perrochaud <clement.perrochaud@effinnov.com>
 +R:    Charles Gorand <charles.gorand@effinnov.com>
 +L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/nxp-nci
 +
  OBJTOOL
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
  S:    Supported
  F:    tools/objtool/
  
 -OMAP1 SUPPORT
 -M:    Aaro Koskinen <aaro.koskinen@iki.fi>
 -M:    Tony Lindgren <tony@atomide.com>
 +OMAP AUDIO SUPPORT
 +M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 +M:    Jarkko Nikula <jarkko.nikula@bitmer.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  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
 +F:    sound/soc/omap/
  
 -OMAP2+ SUPPORT
 -M:    Tony Lindgren <tony@atomide.com>
 +OMAP CLOCK FRAMEWORK SUPPORT
 +M:    Paul Walmsley <paul@pwsan.com>
  L:    linux-omap@vger.kernel.org
 -W:    http://www.muru.com/linux/omap/
 -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/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
 -F:    drivers/mfd/*omap*.c
 -F:    drivers/mfd/menelaus.c
 -F:    drivers/mfd/palmas.c
 -F:    drivers/mfd/tps65217.c
 -F:    drivers/mfd/tps65218.c
 -F:    drivers/mfd/tps65910.c
 -F:    drivers/mfd/twl-core.[ch]
 -F:    drivers/mfd/twl4030*.c
 -F:    drivers/mfd/twl6030*.c
 -F:    drivers/mfd/twl6040*.c
 -F:    drivers/regulator/palmas-regulator*.c
 -F:    drivers/regulator/pbias-regulator.c
 -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
 +F:    arch/arm/*omap*/*clock*
  
  OMAP DEVICE TREE SUPPORT
  M:    Benoît Cousson <bcousson@baylibre.com>
@@@ -9710,20 -9566,33 +9710,20 @@@ F:   arch/arm/boot/dts/*am4
  F:    arch/arm/boot/dts/*am5*
  F:    arch/arm/boot/dts/*dra7*
  
 -OMAP CLOCK FRAMEWORK SUPPORT
 -M:    Paul Walmsley <paul@pwsan.com>
 -L:    linux-omap@vger.kernel.org
 -S:    Maintained
 -F:    arch/arm/*omap*/*clock*
 -
 -OMAP POWER MANAGEMENT SUPPORT
 -M:    Kevin Hilman <khilman@kernel.org>
 -L:    linux-omap@vger.kernel.org
 -S:    Maintained
 -F:    arch/arm/*omap*/*pm*
 -F:    drivers/cpufreq/omap-cpufreq.c
 -
 -OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -M:    Rajendra Nayak <rnayak@codeaurora.org>
 -M:    Paul Walmsley <paul@pwsan.com>
 +OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 +M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-omap@vger.kernel.org
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
 -F:    arch/arm/mach-omap2/prm*
 +F:    drivers/video/fbdev/omap2/
 +F:    Documentation/arm/OMAP/DSS
  
 -OMAP AUDIO SUPPORT
 -M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 -M:    Jarkko Nikula <jarkko.nikula@bitmer.com>
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +OMAP FRAMEBUFFER SUPPORT
 +M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +L:    linux-fbdev@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  S:    Maintained
 -F:    sound/soc/omap/
 +F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
  M:    Roger Quadros <rogerq@ti.com>
@@@ -9733,14 -9602,20 +9733,14 @@@ S:   Maintaine
  F:    drivers/memory/omap-gpmc.c
  F:    arch/arm/mach-omap2/*gpmc*
  
 -OMAP FRAMEBUFFER SUPPORT
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 -L:    linux-fbdev@vger.kernel.org
 -L:    linux-omap@vger.kernel.org
 -S:    Maintained
 -F:    drivers/video/fbdev/omap/
 -
 -OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +OMAP GPIO DRIVER
 +M:    Grygorii Strashko <grygorii.strashko@ti.com>
 +M:    Santosh Shilimkar <ssantosh@kernel.org>
 +M:    Kevin Hilman <khilman@kernel.org>
  L:    linux-omap@vger.kernel.org
 -L:    linux-fbdev@vger.kernel.org
  S:    Maintained
 -F:    drivers/video/fbdev/omap2/
 -F:    Documentation/arm/OMAP/DSS
 +F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
 +F:    drivers/gpio/gpio-omap.c
  
  OMAP HARDWARE SPINLOCK SUPPORT
  M:    Ohad Ben-Cohen <ohad@wizery.com>
@@@ -9748,12 -9623,30 +9748,12 @@@ L:   linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/hwspinlock/omap_hwspinlock.c
  
 -OMAP MMC SUPPORT
 -M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
 -L:    linux-omap@vger.kernel.org
 -S:    Maintained
 -F:    drivers/mmc/host/omap.c
 -
  OMAP HS MMC SUPPORT
  L:    linux-mmc@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  S:    Orphan
  F:    drivers/mmc/host/omap_hsmmc.c
  
 -OMAP RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <dsaxena@plexity.net>
 -S:    Maintained
 -F:    drivers/char/hw_random/omap-rng.c
 -
 -OMAP HWMOD SUPPORT
 -M:    Benoît Cousson <bcousson@baylibre.com>
 -M:    Paul Walmsley <paul@pwsan.com>
 -L:    linux-omap@vger.kernel.org
 -S:    Maintained
 -F:    arch/arm/mach-omap2/omap_hwmod.*
 -
  OMAP HWMOD DATA
  M:    Paul Walmsley <paul@pwsan.com>
  L:    linux-omap@vger.kernel.org
@@@ -9766,13 -9659,6 +9766,13 @@@ L:    linux-omap@vger.kernel.or
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  
 +OMAP HWMOD SUPPORT
 +M:    Benoît Cousson <bcousson@baylibre.com>
 +M:    Paul Walmsley <paul@pwsan.com>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/mach-omap2/omap_hwmod.*
 +
  OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -9781,31 -9667,6 +9781,31 @@@ F:    Documentation/devicetree/bindings/me
  F:    drivers/media/platform/omap3isp/
  F:    drivers/staging/media/omap4iss/
  
 +OMAP MMC SUPPORT
 +M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/omap.c
 +
 +OMAP POWER MANAGEMENT SUPPORT
 +M:    Kevin Hilman <khilman@kernel.org>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/*omap*/*pm*
 +F:    drivers/cpufreq/omap-cpufreq.c
 +
 +OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 +M:    Rajendra Nayak <rnayak@codeaurora.org>
 +M:    Paul Walmsley <paul@pwsan.com>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/mach-omap2/prm*
 +
 +OMAP RANDOM NUMBER GENERATOR SUPPORT
 +M:    Deepak Saxena <dsaxena@plexity.net>
 +S:    Maintained
 +F:    drivers/char/hw_random/omap-rng.c
 +
  OMAP USB SUPPORT
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
@@@ -9813,57 -9674,21 +9813,57 @@@ S:   Orpha
  F:    drivers/usb/*/*omap*
  F:    arch/arm/*omap*/usb*
  
 -OMAP GPIO DRIVER
 -M:    Grygorii Strashko <grygorii.strashko@ti.com>
 -M:    Santosh Shilimkar <ssantosh@kernel.org>
 -M:    Kevin Hilman <khilman@kernel.org>
 -L:    linux-omap@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
 -F:    drivers/gpio/gpio-omap.c
 -
  OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
  M:    Mark Jackson <mpfj@newflow.co.uk>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    arch/arm/boot/dts/am335x-nano.dts
  
 +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/
 +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/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
 +F:    drivers/mfd/*omap*.c
 +F:    drivers/mfd/menelaus.c
 +F:    drivers/mfd/palmas.c
 +F:    drivers/mfd/tps65217.c
 +F:    drivers/mfd/tps65218.c
 +F:    drivers/mfd/tps65910.c
 +F:    drivers/mfd/twl-core.[ch]
 +F:    drivers/mfd/twl4030*.c
 +F:    drivers/mfd/twl6030*.c
 +F:    drivers/mfd/twl6040*.c
 +F:    drivers/regulator/palmas-regulator*.c
 +F:    drivers/regulator/pbias-regulator.c
 +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
 +
  OMFS FILESYSTEM
  M:    Bob Copeland <me@bobcopeland.com>
  L:    linux-karma-devel@lists.sourceforge.net
@@@ -9883,13 -9708,6 +9883,13 @@@ M:    Harald Welte <laforge@gnumonks.org
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OV13858 SENSOR DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov13858.c
 +
  OMNIVISION OV5640 SENSOR DRIVER
  M:    Steve Longerbeam <slongerbeam@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -9898,19 -9716,26 +9898,19 @@@ S:   Maintaine
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
 -M:    Ramiro Oliveira <roliveir@synopsys.com>
 +M:    Luis Oliveira <lolivei@synopsys.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/ov5647.c
 -
 -OMNIVISION OV7670 SENSOR DRIVER
 -M:    Jonathan Corbet <corbet@lwn.net>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/i2c/ov7670.c
 -F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
 -
 -OMNIVISION OV13858 SENSOR DRIVER
 -M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +
 +OMNIVISION OV7670 SENSOR DRIVER
 +M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
 -F:    drivers/media/i2c/ov13858.c
 +F:    drivers/media/i2c/ov7670.c
 +F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -9929,26 -9754,12 +9929,26 @@@ F:   drivers/scsi/osst.
  F:    drivers/scsi/osst_*.h
  F:    drivers/scsi/st.h
  
 -OPENCORES I2C BUS DRIVER
 -M:    Peter Korsgaard <jacmet@sunsite.dk>
 -L:    linux-i2c@vger.kernel.org
 +OP-TEE DRIVER
 +M:    Jens Wiklander <jens.wiklander@linaro.org>
  S:    Maintained
 -F:    Documentation/i2c/busses/i2c-ocores
 -F:    drivers/i2c/busses/i2c-ocores.c
 +F:    drivers/tee/optee/
 +
 +OPA-VNIC DRIVER
 +M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 +M:    Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Supported
 +F:    drivers/infiniband/ulp/opa_vnic
 +
 +OPEN FIRMWARE AND DEVICE TREE OVERLAYS
 +M:    Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 +L:    devicetree@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/dynamic-resolution-notes.txt
 +F:    Documentation/devicetree/overlay-notes.txt
 +F:    drivers/of/overlay.c
 +F:    drivers/of/resolver.c
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Rob Herring <robh+dt@kernel.org>
@@@ -9973,12 -9784,14 +9973,12 @@@ F:   Documentation/devicetree
  F:    arch/*/boot/dts/
  F:    include/dt-bindings/
  
 -OPEN FIRMWARE AND DEVICE TREE OVERLAYS
 -M:    Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 -L:    devicetree@vger.kernel.org
 +OPENCORES I2C BUS DRIVER
 +M:    Peter Korsgaard <jacmet@sunsite.dk>
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/dynamic-resolution-notes.txt
 -F:    Documentation/devicetree/overlay-notes.txt
 -F:    drivers/of/overlay.c
 -F:    drivers/of/resolver.c
 +F:    Documentation/i2c/busses/i2c-ocores
 +F:    drivers/i2c/busses/i2c-ocores.c
  
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <jonas@southpole.se>
@@@ -10027,6 -9840,11 +10027,6 @@@ F:   arch/*/oprofile
  F:    drivers/oprofile/
  F:    include/linux/oprofile.h
  
 -OP-TEE DRIVER
 -M:    Jens Wiklander <jens.wiklander@linaro.org>
 -S:    Maintained
 -F:    drivers/tee/optee/
 -
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
  M:    Mark Fasheh <mfasheh@versity.com>
  M:    Joel Becker <jlbec@evilplan.org>
@@@ -10037,14 -9855,6 +10037,14 @@@ F:  Documentation/filesystems/ocfs2.tx
  F:    Documentation/filesystems/dlmfs.txt
  F:    fs/ocfs2/
  
 +ORANGEFS FILESYSTEM
 +M:    Mike Marshall <hubcap@omnibond.com>
 +L:    pvfs2-developers@beowulf-underground.org (subscribers-only)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 +S:    Supported
 +F:    fs/orangefs/
 +F:    Documentation/filesystems/orangefs.txt
 +
  ORINOCO DRIVER
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/orinoco
@@@ -10059,16 -9869,6 +10059,16 @@@ F:  drivers/scsi/osd
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
 +OV2659 OMNIVISION SENSOR DRIVER
 +M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov2659.c
 +F:    include/media/i2c/ov2659.h
 +
  OVERLAY FILESYSTEM
  M:    Miklos Szeredi <miklos@szeredi.hu>
  L:    linux-unionfs@vger.kernel.org
@@@ -10077,6 -9877,14 +10077,6 @@@ S:   Supporte
  F:    fs/overlayfs/
  F:    Documentation/filesystems/overlayfs.txt
  
 -ORANGEFS FILESYSTEM
 -M:    Mike Marshall <hubcap@omnibond.com>
 -L:    pvfs2-developers@beowulf-underground.org (subscribers-only)
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 -S:    Supported
 -F:    fs/orangefs/
 -F:    Documentation/filesystems/orangefs.txt
 -
  P54 WIRELESS DRIVER
  M:    Christian Lamparter <chunkeey@googlemail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -10117,11 -9925,11 +10117,11 @@@ F: Documentation/mn10300
  F:    arch/mn10300/
  
  PARALLEL LCD/KEYPAD PANEL DRIVER
 -M:      Willy Tarreau <willy@haproxy.com>
 -M:      Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
 -S:      Odd Fixes
 -F:      Documentation/misc-devices/lcd-panel-cgram.txt
 -F:      drivers/misc/panel.c
 +M:    Willy Tarreau <willy@haproxy.com>
 +M:    Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
 +S:    Odd Fixes
 +F:    Documentation/misc-devices/lcd-panel-cgram.txt
 +F:    drivers/misc/panel.c
  
  PARALLEL PORT SUBSYSTEM
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@@ -10217,13 -10025,42 +10217,13 @@@ M:        Khalid Aziz <khalid@gonehiking.org
  S:    Maintained
  F:    drivers/firmware/pcdp.*
  
 -PCI ERROR RECOVERY
 -M:    Linas Vepstas <linasvepstas@gmail.com>
 -L:    linux-pci@vger.kernel.org
 -S:    Supported
 -F:    Documentation/PCI/pci-error-recovery.txt
 -
 -PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 -M:    Russell Currey <ruscur@russell.cc>
 -L:    linuxppc-dev@lists.ozlabs.org
 -S:    Supported
 -F:    Documentation/powerpc/eeh-pci-error-recovery.txt
 -F:    arch/powerpc/kernel/eeh*.c
 -F:    arch/powerpc/platforms/*/eeh*.c
 -F:    arch/powerpc/include/*/eeh*.h
 -
 -PCI SUBSYSTEM
 -M:    Bjorn Helgaas <bhelgaas@google.com>
 -L:    linux-pci@vger.kernel.org
 -Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 -S:    Supported
 -F:    Documentation/devicetree/bindings/pci/
 -F:    Documentation/PCI/
 -F:    drivers/pci/
 -F:    include/linux/pci*
 -F:    arch/x86/pci/
 -F:    arch/x86/kernel/quirks.c
 -
 -PCI ENDPOINT SUBSYSTEM
 -M:    Kishon Vijay Abraham I <kishon@ti.com>
 +PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
 +M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  L:    linux-pci@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
 -S:    Supported
 -F:    drivers/pci/endpoint/
 -F:    drivers/misc/pci_endpoint_test.c
 -F:    tools/pci/
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/aardvark-pci.txt
 +F:    drivers/pci/host/pci-aardvark.c
  
  PCI DRIVER FOR ALTERA PCIE IP
  M:    Ley Foon Tan <lftan@altera.com>
@@@ -10233,14 -10070,6 +10233,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/pci/altera-pcie.txt
  F:    drivers/pci/host/pcie-altera.c
  
 +PCI DRIVER FOR APPLIEDMICRO XGENE
 +M:    Tanmay Inamdar <tinamdar@apm.com>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
 +F:    drivers/pci/host/pci-xgene.c
 +
  PCI DRIVER FOR ARM VERSATILE PLATFORM
  M:    Rob Herring <robh@kernel.org>
  L:    linux-pci@vger.kernel.org
@@@ -10257,6 -10086,14 +10257,6 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/pci/pci-armada8k.txt
  F:    drivers/pci/dwc/pcie-armada8k.c
  
 -PCI DRIVER FOR APPLIEDMICRO XGENE
 -M:    Tanmay Inamdar <tinamdar@apm.com>
 -L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
 -F:    drivers/pci/host/pci-xgene.c
 -
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <minghuan.Lian@freescale.com>
  M:    Mingkai Hu <mingkai.hu@freescale.com>
@@@ -10267,15 -10104,6 +10267,15 @@@ L: linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    drivers/pci/dwc/*layerscape*
  
 +PCI DRIVER FOR GENERIC OF HOSTS
 +M:    Will Deacon <will.deacon@arm.com>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
 +F:    drivers/pci/host/pci-host-common.c
 +F:    drivers/pci/host/pci-host-generic.c
 +
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <hongxing.zhu@nxp.com>
  M:    Lucas Stach <l.stach@pengutronix.de>
@@@ -10285,12 -10113,28 +10285,12 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
  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/dwc/*keystone*
 -
 -PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 -M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 -M:    Jason Cooper <jason@lakedaemon.net>
 -L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    drivers/pci/host/*mvebu*
 -
 -PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
 -M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 +M:    Keith Busch <keith.busch@intel.com>
 +M:    Jonathan Derrick <jonathan.derrick@intel.com>
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/aardvark-pci.txt
 -F:    drivers/pci/host/pci-aardvark.c
 +S:    Supported
 +F:    drivers/pci/host/vmd.c
  
  PCI DRIVER FOR MICROSEMI SWITCHTEC
  M:    Kurt Schwemmer <kurt.schwemmer@microsemi.com>
@@@ -10303,14 -10147,6 +10303,14 @@@ F: Documentation/ABI/testing/sysfs-clas
  F:    drivers/pci/switch/switchtec*
  F:    include/uapi/linux/switchtec_ioctl.h
  
 +PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 +M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Jason Cooper <jason@lakedaemon.net>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*mvebu*
 +
  PCI DRIVER FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
  L:    linux-tegra@vger.kernel.org
@@@ -10319,6 -10155,14 +10319,6 @@@ S:  Supporte
  F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
  F:    drivers/pci/host/pci-tegra.c
  
 -PCI DRIVER FOR TI DRA7XX
 -M:    Kishon Vijay Abraham I <kishon@ti.com>
 -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/dwc/pci-dra7xx.c
 -
  PCI DRIVER FOR RENESAS R-CAR
  M:    Simon Horman <horms@verge.net.au>
  L:    linux-pci@vger.kernel.org
@@@ -10334,7 -10178,7 +10334,7 @@@ L:   linux-samsung-soc@vger.kernel.org (m
  S:    Maintained
  F:    drivers/pci/dwc/pci-exynos.c
  
 -PCI DRIVER FOR SYNOPSIS DESIGNWARE
 +PCI DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Jingoo Han <jingoohan1@gmail.com>
  M:    Joao Pinto <Joao.Pinto@synopsys.com>
  L:    linux-pci@vger.kernel.org
@@@ -10342,44 -10186,26 +10342,44 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
  F:    drivers/pci/dwc/*designware*
  
 -PCI DRIVER FOR GENERIC OF HOSTS
 -M:    Will Deacon <will.deacon@arm.com>
 +PCI DRIVER FOR TI DRA7XX
 +M:    Kishon Vijay Abraham I <kishon@ti.com>
 +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/dwc/pci-dra7xx.c
 +
 +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:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
 -F:    drivers/pci/host/pci-host-common.c
 -F:    drivers/pci/host/pci-host-generic.c
 +F:    drivers/pci/dwc/*keystone*
  
 -PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 -M:    Keith Busch <keith.busch@intel.com>
 +PCI ENDPOINT SUBSYSTEM
 +M:    Kishon Vijay Abraham I <kishon@ti.com>
  L:    linux-pci@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
  S:    Supported
 -F:    drivers/pci/host/vmd.c
 +F:    drivers/pci/endpoint/
 +F:    drivers/misc/pci_endpoint_test.c
 +F:    tools/pci/
  
 -PCIE DRIVER FOR ST SPEAR13XX
 -M:    Pratyush Anand <pratyush.anand@gmail.com>
 +PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 +M:    Russell Currey <ruscur@russell.cc>
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Supported
 +F:    Documentation/powerpc/eeh-pci-error-recovery.txt
 +F:    arch/powerpc/kernel/eeh*.c
 +F:    arch/powerpc/platforms/*/eeh*.c
 +F:    arch/powerpc/include/*/eeh*.h
 +
 +PCI ERROR RECOVERY
 +M:    Linas Vepstas <linasvepstas@gmail.com>
  L:    linux-pci@vger.kernel.org
 -S:    Maintained
 -F:    drivers/pci/dwc/*spear*
 +S:    Supported
 +F:    Documentation/PCI/pci-error-recovery.txt
  
  PCI MSI DRIVER FOR ALTERA MSI IP
  M:    Ley Foon Tan <lftan@altera.com>
@@@ -10397,19 -10223,6 +10397,19 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
  F:    drivers/pci/host/pci-xgene-msi.c
  
 +PCI SUBSYSTEM
 +M:    Bjorn Helgaas <bhelgaas@google.com>
 +L:    linux-pci@vger.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/
 +F:    Documentation/PCI/
 +F:    drivers/pci/
 +F:    include/linux/pci*
 +F:    arch/x86/pci/
 +F:    arch/x86/kernel/quirks.c
 +
  PCIE DRIVER FOR AXIS ARTPEC
  M:    Niklas Cassel <niklas.cassel@axis.com>
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
@@@ -10419,14 -10232,6 +10419,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/axis,artpec*
  F:    drivers/pci/dwc/*artpec*
  
 +PCIE DRIVER FOR CAVIUM THUNDERX
 +M:    David Daney <david.daney@cavium.com>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/pci-thunder-*
 +F:    drivers/pci/host/pci-thunder-*
 +
  PCIE DRIVER FOR HISILICON
  M:    Zhou Wang <wangzhou1@hisilicon.com>
  M:    Gabriele Paoloni <gabriele.paoloni@huawei.com>
@@@ -10443,21 -10248,6 +10443,21 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/pcie-kirin.txt
  F:    drivers/pci/dwc/pcie-kirin.c
  
 +PCIE DRIVER FOR MEDIATEK
 +M:    Ryder Lee <ryder.lee@mediatek.com>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-mediatek@lists.infradead.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/mediatek*
 +F:    drivers/pci/host/*mediatek*
 +
 +PCIE DRIVER FOR QUALCOMM MSM
 +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/dwc/*qcom*
 +
  PCIE DRIVER FOR ROCKCHIP
  M:    Shawn Lin <shawn.lin@rock-chips.com>
  L:    linux-pci@vger.kernel.org
@@@ -10466,11 -10256,28 +10466,11 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/pci/rockchip-pcie.txt
  F:    drivers/pci/host/pcie-rockchip.c
  
 -PCIE DRIVER FOR QUALCOMM MSM
 -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/dwc/*qcom*
 -
 -PCIE DRIVER FOR CAVIUM THUNDERX
 -M:    David Daney <david.daney@cavium.com>
 +PCIE DRIVER FOR ST SPEAR13XX
 +M:    Pratyush Anand <pratyush.anand@gmail.com>
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 -F:    Documentation/devicetree/bindings/pci/pci-thunder-*
 -F:    drivers/pci/host/pci-thunder-*
 -
 -PCIE DRIVER FOR MEDIATEK
 -M:      Ryder Lee <ryder.lee@mediatek.com>
 -L:      linux-pci@vger.kernel.org
 -L:      linux-mediatek@lists.infradead.org
 -S:      Supported
 -F:      Documentation/devicetree/bindings/pci/mediatek*
 -F:      drivers/pci/host/*mediatek*
 +S:    Maintained
 +F:    drivers/pci/dwc/*spear*
  
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
@@@ -10573,7 -10380,7 +10573,7 @@@ L:   linux-gpio@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/
 -F:    Documentation/pinctrl.txt
 +F:    Documentation/driver-api/pinctl.rst
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
  
@@@ -10639,14 -10446,14 +10639,14 @@@ S:        Maintaine
  F:    drivers/pinctrl/spear/
  
  PISTACHIO SOC SUPPORT
 -M:      James Hartley <james.hartley@imgtec.com>
 -M:      Ionela Voinescu <ionela.voinescu@imgtec.com>
 -L:      linux-mips@linux-mips.org
 -S:      Maintained
 -F:      arch/mips/pistachio/
 -F:      arch/mips/include/asm/mach-pistachio/
 -F:      arch/mips/boot/dts/img/pistachio*
 -F:      arch/mips/configs/pistachio*_defconfig
 +M:    James Hartley <james.hartley@imgtec.com>
 +M:    Ionela Voinescu <ionela.voinescu@imgtec.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/pistachio/
 +F:    arch/mips/include/asm/mach-pistachio/
 +F:    arch/mips/boot/dts/img/pistachio*
 +F:    arch/mips/configs/pistachio*_defconfig
  
  PKTCDVD DRIVER
  S:    Orphan
@@@ -10689,11 -10496,6 +10689,11 @@@ L: linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/pm8001/
  
 +PNP SUPPORT
 +M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 +S:    Maintained
 +F:    drivers/pnp/
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <tglx@linutronix.de>
  L:    linux-kernel@vger.kernel.org
@@@ -10715,6 -10517,15 +10715,6 @@@ F:  include/linux/pm_
  F:    include/linux/powercap.h
  F:    drivers/powercap/
  
 -POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Sebastian Reichel <sre@kernel.org>
 -L:    linux-pm@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/power/supply/
 -F:    include/linux/power_supply.h
 -F:    drivers/power/supply/
 -
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <mark.rutland@arm.com>
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
@@@ -10724,21 -10535,23 +10724,21 @@@ F:        drivers/firmware/psci*.
  F:    include/linux/psci.h
  F:    include/uapi/linux/psci.h
  
 +POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 +M:    Sebastian Reichel <sre@kernel.org>
 +L:    linux-pm@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/supply/
 +F:    include/linux/power_supply.h
 +F:    drivers/power/supply/
 +
  POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
  M:    Suraj Jitindar Singh <sjitindarsingh@gmail.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/char/powernv-op-panel.c
  
 -PNP SUPPORT
 -M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 -S:    Maintained
 -F:    drivers/pnp/
 -
 -PPP PROTOCOL DRIVERS AND COMPRESSORS
 -M:    Paul Mackerras <paulus@samba.org>
 -L:    linux-ppp@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ppp/ppp_*
 -
  PPP OVER ATM (RFC 2364)
  M:    Mitchell Blank Jr <mitch@sfgoth.com>
  S:    Maintained
@@@ -10758,23 -10571,14 +10758,23 @@@ F:        net/l2tp/l2tp_ppp.
  F:    include/linux/if_pppol2tp.h
  F:    include/uapi/linux/if_pppol2tp.h
  
 +PPP PROTOCOL DRIVERS AND COMPRESSORS
 +M:    Paul Mackerras <paulus@samba.org>
 +L:    linux-ppp@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ppp/ppp_*
 +
  PPS SUPPORT
  M:    Rodolfo Giometti <giometti@enneenne.com>
  W:    http://wiki.enneenne.com/index.php/LinuxPPS_support
  L:    linuxpps@ml.enneenne.com (subscribers-only)
  S:    Maintained
  F:    Documentation/pps/
 +F:    Documentation/devicetree/bindings/pps/pps-gpio.txt
 +F:    Documentation/ABI/testing/sysfs-pps
  F:    drivers/pps/
  F:    include/linux/pps*.h
 +F:    include/uapi/linux/pps.h
  
  PPTP DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>
@@@ -10880,6 -10684,7 +10880,6 @@@ F:   drivers/ptp/
  F:    include/linux/ptp_cl*
  
  PTRACE SUPPORT
 -M:    Roland McGrath <roland@hack.frob.com>
  M:    Oleg Nesterov <oleg@redhat.com>
  S:    Maintained
  F:    include/asm-generic/syscall.h
@@@ -10887,12 -10692,7 +10887,12 @@@ F: include/linux/ptrace.
  F:    include/linux/regset.h
  F:    include/linux/tracehook.h
  F:    include/uapi/linux/ptrace.h
 +F:    include/uapi/linux/ptrace.h
 +F:    include/asm-generic/ptrace.h
  F:    kernel/ptrace.c
 +F:    arch/*/ptrace*.c
 +F:    arch/*/*/ptrace*.c
 +F:    arch/*/include/asm/ptrace*.h
  
  PULSE8-CEC DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -10900,7 -10700,6 +10900,7 @@@ L:   linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/pulse8-cec/*
 +F:    Documentation/media/cec-drivers/pulse8-cec.rst
  
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <isely@pobox.com>
@@@ -10928,12 -10727,6 +10928,12 @@@ F: Documentation/devicetree/bindings/hw
  F:    Documentation/hwmon/pwm-fan
  F:    drivers/hwmon/pwm-fan.c
  
 +PWM IR Transmitter
 +M:    Sean Young <sean@mess.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/rc/pwm-ir-tx.c
 +
  PWM SUBSYSTEM
  M:    Thierry Reding <thierry.reding@gmail.com>
  L:    linux-pwm@vger.kernel.org
@@@ -10948,20 -10741,6 +10948,20 @@@ F: include/linux/pwm_backlight.
  F:    drivers/gpio/gpio-mvebu.c
  F:    Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
  
 +PXA GPIO DRIVER
 +M:    Robert Jarzmik <robert.jarzmik@free.fr>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-pxa.c
 +
 +PXA MMCI DRIVER
 +S:    Orphan
 +
 +PXA RTC DRIVER
 +M:    Robert Jarzmik <robert.jarzmik@free.fr>
 +L:    linux-rtc@vger.kernel.org
 +S:    Maintained
 +
  PXA2xx/PXA3xx SUPPORT
  M:    Daniel Mack <daniel@zonque.org>
  M:    Haojian Zhuang <haojian.zhuang@gmail.com>
@@@ -10981,12 -10760,36 +10981,12 @@@ F:        include/sound/pxa2xx-lib.
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
 -PXA GPIO DRIVER
 -M:    Robert Jarzmik <robert.jarzmik@free.fr>
 -L:    linux-gpio@vger.kernel.org
 -S:    Maintained
 -F:    drivers/gpio/gpio-pxa.c
 -
  PXA3xx NAND FLASH DRIVER
  M:    Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
  F:    drivers/mtd/nand/pxa3xx_nand.c
  
 -MMP SUPPORT
 -M:    Eric Miao <eric.y.miao@gmail.com>
 -M:    Haojian Zhuang <haojian.zhuang@gmail.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -T:    git git://github.com/hzhuang1/linux.git
 -T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
 -S:    Maintained
 -F:    arch/arm/boot/dts/mmp*
 -F:    arch/arm/mach-mmp/
 -
 -PXA MMCI DRIVER
 -S:    Orphan
 -
 -PXA RTC DRIVER
 -M:    Robert Jarzmik <robert.jarzmik@free.fr>
 -L:    linux-rtc@vger.kernel.org
 -S:    Maintained
 -
  QAT DRIVER
  M:    Giovanni Cabiddu <giovanni.cabiddu@intel.com>
  M:    Salvatore Benedetto <salvatore.benedetto@intel.com>
@@@ -10994,56 -10797,12 +10994,56 @@@ L:        qat-linux@intel.co
  S:    Supported
  F:    drivers/crypto/qat/
  
 +QCOM AUDIO (ASoC) DRIVERS
 +M:    Patrick Lai <plai@codeaurora.org>
 +M:    Banajit Goswami <bgoswami@codeaurora.org>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/soc/qcom/
 +
 +QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 +M:    Gabriel Somlo <somlo@cmu.edu>
 +M:    "Michael S. Tsirkin" <mst@redhat.com>
 +L:    qemu-devel@nongnu.org
 +S:    Maintained
 +F:    drivers/firmware/qemu_fw_cfg.c
 +
  QIB DRIVER
  M:    Mike Marciniszyn <infinipath@intel.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  F:    drivers/infiniband/hw/qib/
  
 +QLOGIC QL41xxx FCOE DRIVER
 +M:    QLogic-Storage-Upstream@cavium.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/qedf/
 +
 +QLOGIC QL41xxx ISCSI DRIVER
 +M:    QLogic-Storage-Upstream@cavium.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/qedi/
 +
 +QLOGIC QL4xxx ETHERNET DRIVER
 +M:    Yuval Mintz <Yuval.Mintz@cavium.com>
 +M:    Ariel Elior <Ariel.Elior@cavium.com>
 +M:    everest-linux-l2@cavium.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/qlogic/qed/
 +F:    include/linux/qed/
 +F:    drivers/net/ethernet/qlogic/qede/
 +
 +QLOGIC QL4xxx RDMA DRIVER
 +M:    Ram Amrani <Ram.Amrani@cavium.com>
 +M:    Ariel Elior <Ariel.Elior@cavium.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Supported
 +F:    drivers/infiniband/hw/qedr/
 +F:    include/uapi/rdma/qedr-abi.h
 +
  QLOGIC QLA1280 SCSI DRIVER
  M:    Michael Reed <mdr@sgi.com>
  L:    linux-scsi@vger.kernel.org
@@@ -11057,6 -10816,13 +11057,6 @@@ S:  Supporte
  F:    Documentation/scsi/LICENSE.qla2xxx
  F:    drivers/scsi/qla2xxx/
  
 -QLOGIC QLA4XXX iSCSI DRIVER
 -M:    QLogic-Storage-Upstream@qlogic.com
 -L:    linux-scsi@vger.kernel.org
 -S:    Supported
 -F:    Documentation/scsi/LICENSE.qla4xxx
 -F:    drivers/scsi/qla4xxx/
 -
  QLOGIC QLA3XXX NETWORK DRIVER
  M:    Dept-GELinuxNICDev@cavium.com
  L:    netdev@vger.kernel.org
@@@ -11064,13 -10830,6 +11064,13 @@@ S: Supporte
  F:    Documentation/networking/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
 +QLOGIC QLA4XXX iSCSI DRIVER
 +M:    QLogic-Storage-Upstream@qlogic.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    Documentation/scsi/LICENSE.qla4xxx
 +F:    drivers/scsi/qla4xxx/
 +
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
  M:    Harish Patil <harish.patil@cavium.com>
  M:    Manish Chopra <manish.chopra@cavium.com>
@@@ -11087,6 -10846,28 +11087,6 @@@ L:  netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlge/
  
 -QLOGIC QL4xxx ETHERNET DRIVER
 -M:    Yuval Mintz <Yuval.Mintz@cavium.com>
 -M:    Ariel Elior <Ariel.Elior@cavium.com>
 -M:    everest-linux-l2@cavium.com
 -L:    netdev@vger.kernel.org
 -S:    Supported
 -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/
@@@ -11113,6 -10894,13 +11113,6 @@@ T:  git git://linuxtv.org/anttip/media_t
  S:    Maintained
  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
 -W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 -S:    Supported
 -F:    drivers/net/wireless/ath/ath9k/
 -
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    ath10k@lists.infradead.org
@@@ -11121,21 -10909,6 +11121,21 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/ath/ath10k/
  
 +QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 +M:    QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
 +L:    linux-wireless@vger.kernel.org
 +W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 +S:    Supported
 +F:    drivers/net/wireless/ath/ath9k/
 +
 +QUALCOMM CAMERA SUBSYSTEM DRIVER
 +M:    Todor Tomov <todor.tomov@linaro.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/qcom,camss.txt
 +F:    Documentation/media/v4l-drivers/qcom_camss.rst
 +F:    drivers/media/platform/qcom/camss-8x16/
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <timur@codeaurora.org>
  L:    netdev@vger.kernel.org
@@@ -11149,13 -10922,6 +11149,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/hexagon/
  
 +QUALCOMM IOMMU
 +M:    Rob Clark <robdclark@gmail.com>
 +L:    iommu@lists.linux-foundation.org
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/iommu/qcom_iommu.c
 +
  QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
  M:    Stanimir Varbanov <stanimir.varbanov@linaro.org>
  L:    linux-media@vger.kernel.org
@@@ -11172,24 -10938,33 +11172,24 @@@ T:        git git://github.com/KrasnikovEugene
  S:    Supported
  F:    drivers/net/wireless/ath/wcn36xx/
  
 -QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 -M:    Gabriel Somlo <somlo@cmu.edu>
 -M:    "Michael S. Tsirkin" <mst@redhat.com>
 -L:    qemu-devel@nongnu.org
 -S:    Maintained
 -F:    drivers/firmware/qemu_fw_cfg.c
 -
  QUANTENNA QTNFMAC WIRELESS DRIVER
 -M:   Igor Mitsyanko <imitsyanko@quantenna.com>
 -M:   Avinash Patil <avinashp@quantenna.com>
 -M:   Sergey Matyukevich <smatyukevich@quantenna.com>
 -L:   linux-wireless@vger.kernel.org
 -S:   Maintained
 -F:   drivers/net/wireless/quantenna
 +M:    Igor Mitsyanko <imitsyanko@quantenna.com>
 +M:    Avinash Patil <avinashp@quantenna.com>
 +M:    Sergey Matyukevich <smatyukevich@quantenna.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/wireless/quantenna
  
 -RADOS BLOCK DEVICE (RBD)
 -M:    Ilya Dryomov <idryomov@gmail.com>
 -M:    Sage Weil <sage@redhat.com>
 -M:    Alex Elder <elder@kernel.org>
 -L:    ceph-devel@vger.kernel.org
 -W:    http://ceph.com/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 -T:    git git://github.com/ceph/ceph-client.git
 +RADEON and AMDGPU DRM DRIVERS
 +M:    Alex Deucher <alexander.deucher@amd.com>
 +M:    Christian König <christian.koenig@amd.com>
 +L:    amd-gfx@lists.freedesktop.org
 +T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
 -F:    Documentation/ABI/testing/sysfs-bus-rbd
 -F:    drivers/block/rbd.c
 -F:    drivers/block/rbd_types.h
 +F:    drivers/gpu/drm/radeon/
 +F:    include/uapi/drm/radeon_drm.h
 +F:    drivers/gpu/drm/amd/
 +F:    include/uapi/drm/amdgpu_drm.h
  
  RADEON FRAMEBUFFER DISPLAY DRIVER
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@@ -11213,19 -10988,6 +11213,19 @@@ S: Maintaine
  F:    drivers/media/radio/radio-shark2.c
  F:    drivers/media/radio/radio-tea5777.c
  
 +RADOS BLOCK DEVICE (RBD)
 +M:    Ilya Dryomov <idryomov@gmail.com>
 +M:    Sage Weil <sage@redhat.com>
 +M:    Alex Elder <elder@kernel.org>
 +L:    ceph-devel@vger.kernel.org
 +W:    http://ceph.com/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 +T:    git git://github.com/ceph/ceph-client.git
 +S:    Supported
 +F:    Documentation/ABI/testing/sysfs-bus-rbd
 +F:    drivers/block/rbd.c
 +F:    drivers/block/rbd_types.h
 +
  RAGE128 FRAMEBUFFER DISPLAY DRIVER
  M:    Paul Mackerras <paulus@samba.org>
  L:    linux-fbdev@vger.kernel.org
@@@ -11305,12 -11067,6 +11305,12 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/rdc/r6040.c
  
 +RDMAVT - RDMA verbs software
 +M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Supported
 +F:    drivers/infiniband/sw/rdmavt
 +
  RDS - RELIABLE DATAGRAM SOCKETS
  M:    Santosh Shilimkar <santosh.shilimkar@oracle.com>
  L:    netdev@vger.kernel.org
@@@ -11321,12 -11077,18 +11321,12 @@@ S:        Supporte
  F:    net/rds/
  F:    Documentation/networking/rds.txt
  
 -RDMAVT - RDMA verbs software
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -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:    arch/x86/include/asm/intel_rdt_sched.h
  F:    Documentation/x86/intel_rdt*
  
  READ-COPY UPDATE (RCU)
@@@ -11366,8 -11128,13 +11366,8 @@@ REALTEK AUDIO CODEC
  M:    Bard Liao <bardliao@realtek.com>
  M:    Oder Chiou <oder_chiou@realtek.com>
  S:    Maintained
 -F:    sound/soc/codecs/rt*
 -F:    include/sound/rt*.h
 -
 -REISERFS FILE SYSTEM
 -L:    reiserfs-devel@vger.kernel.org
 -S:    Supported
 -F:    fs/reiserfs/
 +F:    sound/soc/codecs/rt*
 +F:    include/sound/rt*.h
  
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <broonie@kernel.org>
@@@ -11378,11 -11145,6 +11378,11 @@@ F: Documentation/devicetree/bindings/re
  F:    drivers/base/regmap/
  F:    include/linux/regmap.h
  
 +REISERFS FILE SYSTEM
 +L:    reiserfs-devel@vger.kernel.org
 +S:    Supported
 +F:    fs/reiserfs/
 +
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Ohad Ben-Cohen <ohad@wizery.com>
  M:    Bjorn Andersson <bjorn.andersson@linaro.org>
@@@ -11458,16 -11220,16 +11458,16 @@@ S:        Maintaine
  F:    lib/rhashtable.c
  F:    include/linux/rhashtable.h
  
 -RICOH SMARTMEDIA/XD DRIVER
 +RICOH R5C592 MEMORYSTICK DRIVER
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
  S:    Maintained
 -F:    drivers/mtd/nand/r852.c
 -F:    drivers/mtd/nand/r852.h
 +F:    drivers/memstick/host/r592.*
  
 -RICOH R5C592 MEMORYSTICK DRIVER
 +RICOH SMARTMEDIA/XD DRIVER
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
  S:    Maintained
 -F:    drivers/memstick/host/r592.*
 +F:    drivers/mtd/nand/r852.c
 +F:    drivers/mtd/nand/r852.h
  
  ROCCAT DRIVERS
  M:    Stefan Achatz <erazor_de@users.sourceforge.net>
@@@ -11496,17 -11258,6 +11496,17 @@@ L: linux-serial@vger.kernel.or
  S:    Odd Fixes
  F:    drivers/tty/serial/rp2.*
  
 +ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
 +M:    Marek Vasut <marek.vasut+renesas@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
 +S:    Supported
 +F:    drivers/mfd/bd9571mwv.c
 +F:    drivers/regulator/bd9571mwv-regulator.c
 +F:    drivers/gpio/gpio-bd9571mwv.c
 +F:    include/linux/mfd/bd9571mwv.h
 +F:    Documentation/devicetree/bindings/mfd/bd9571mwv.txt
 +
  ROSE NETWORK LAYER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-hams@vger.kernel.org
@@@ -11615,23 -11366,6 +11615,23 @@@ S: Supporte
  F:    drivers/s390/block/dasd*
  F:    block/partitions/ibm.c
  
 +S390 IOMMU (PCI)
 +M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    drivers/iommu/s390-iommu.c
 +
 +S390 IUCV NETWORK LAYER
 +M:    Julian Wiedmann <jwi@linux.vnet.ibm.com>
 +M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    drivers/s390/net/*iucv*
 +F:    include/net/iucv/
 +F:    net/iucv/
 +
  S390 NETWORK DRIVERS
  M:    Julian Wiedmann <jwi@linux.vnet.ibm.com>
  M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
@@@ -11649,16 -11383,6 +11649,16 @@@ S: Supporte
  F:    arch/s390/pci/
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  
 +S390 VFIO-CCW DRIVER
 +M:    Cornelia Huck <cohuck@redhat.com>
 +M:    Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +L:    kvm@vger.kernel.org
 +S:    Supported
 +F:    drivers/s390/cio/vfio_ccw*
 +F:    Documentation/s390/vfio-ccw.txt
 +F:    include/uapi/linux/vfio_ccw.h
 +
  S390 ZCRYPT DRIVER
  M:    Harald Freudenberger <freude@de.ibm.com>
  L:    linux-s390@vger.kernel.org
@@@ -11668,12 -11392,38 +11668,12 @@@ F:        drivers/s390/crypto
  
  S390 ZFCP DRIVER
  M:    Steffen Maier <maier@linux.vnet.ibm.com>
 +M:    Benjamin Block <bblock@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/scsi/zfcp_*
  
 -S390 IUCV NETWORK LAYER
 -M:    Julian Wiedmann <jwi@linux.vnet.ibm.com>
 -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:    drivers/s390/net/*iucv*
 -F:    include/net/iucv/
 -F:    net/iucv/
 -
 -S390 IOMMU (PCI)
 -M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
 -L:    linux-s390@vger.kernel.org
 -W:    http://www.ibm.com/developerworks/linux/linux390/
 -S:    Supported
 -F:    drivers/iommu/s390-iommu.c
 -
 -S390 VFIO-CCW DRIVER
 -M:    Cornelia Huck <cohuck@redhat.com>
 -M:    Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
 -L:    linux-s390@vger.kernel.org
 -L:    kvm@vger.kernel.org
 -S:    Supported
 -F:    drivers/s390/cio/vfio_ccw*
 -F:    Documentation/s390/vfio-ccw.txt
 -F:    include/uapi/linux/vfio_ccw.h
 -
  S3C24XX SD/MMC Driver
  M:    Ben Dooks <ben-linux@fluff.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -11707,6 -11457,12 +11707,6 @@@ F:  drivers/media/common/saa7146
  F:    drivers/media/pci/saa7146/
  F:    include/media/saa7146*
  
 -SAMSUNG LAPTOP DRIVER
 -M:    Corentin Chary <corentin.chary@gmail.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/samsung-laptop.c
 -
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Sangbeom Kim <sbkim73@samsung.com>
@@@ -11729,12 -11485,6 +11729,12 @@@ L: linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/s3c-fb.c
  
 +SAMSUNG LAPTOP DRIVER
 +M:    Corentin Chary <corentin.chary@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/samsung-laptop.c
 +
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Sangbeom Kim <sbkim73@samsung.com>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
@@@ -11753,6 -11503,22 +11753,6 @@@ F:  Documentation/devicetree/bindings/re
  F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
  F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
  
 -SAMSUNG S5P Security SubSystem (SSS) DRIVER
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 -M:    Vladimir Zapolskiy <vz@mleia.com>
 -L:    linux-crypto@vger.kernel.org
 -L:    linux-samsung-soc@vger.kernel.org
 -S:    Maintained
 -F:    drivers/crypto/s5p-sss.c
 -
 -SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 -L:    linux-media@vger.kernel.org
 -Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 -S:    Supported
 -F:    drivers/media/platform/exynos4-is/
 -
  SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
  M:    Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -11761,13 -11527,6 +11761,13 @@@ S: Maintaine
  F:    drivers/media/platform/s3c-camif/
  F:    include/media/drv-intf/s3c_camif.h
  
 +SAMSUNG S3FWRN5 NFC DRIVER
 +M:    Robert Baldyga <r.baldyga@samsung.com>
 +M:    Krzysztof Opasiak <k.opasiak@samsung.com>
 +L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/s3fwrn5
 +
  SAMSUNG S5C73M3 CAMERA DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Andrzej Hajda <a.hajda@samsung.com>
@@@ -11782,21 -11541,12 +11782,21 @@@ L:        linux-media@vger.kernel.or
  S:    Supported
  F:    drivers/media/i2c/s5k5baf.c
  
 -SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Robert Baldyga <r.baldyga@samsung.com>
 -M:    Krzysztof Opasiak <k.opasiak@samsung.com>
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +SAMSUNG S5P Security SubSystem (SSS) DRIVER
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Vladimir Zapolskiy <vz@mleia.com>
 +L:    linux-crypto@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/s5p-sss.c
 +
 +SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +L:    linux-media@vger.kernel.org
 +Q:    https://patchwork.linuxtv.org/project/linux-media/list/
  S:    Supported
 -F:    drivers/nfc/s3fwrn5
 +F:    drivers/media/platform/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
@@@ -11822,32 -11572,152 +11822,32 @@@ F:       include/linux/platform_data/spi-s3c6
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <bh74.an@samsung.com>
  M:    Girish K S <ks.giri@samsung.com>
 -M:    Vipul Pandya <vipul.pandya@samsung.com>
 -S:    Supported
 -L:    netdev@vger.kernel.org
 -F:    drivers/net/ethernet/samsung/sxgbe/
 -
 -SAMSUNG THERMAL DRIVER
 -M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 -L:    linux-pm@vger.kernel.org
 -L:    linux-samsung-soc@vger.kernel.org
 -S:    Supported
 -T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 -F:    drivers/thermal/samsung/
 -
 -SAMSUNG USB2 PHY DRIVER
 -M:    Kamil Debski <kamil@wypas.org>
 -M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 -L:    linux-kernel@vger.kernel.org
 -S:    Supported
 -F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
 -F:    Documentation/phy/samsung-usb2.txt
 -F:    drivers/phy/samsung/phy-exynos4210-usb2.c
 -F:    drivers/phy/samsung/phy-exynos4x12-usb2.c
 -F:    drivers/phy/samsung/phy-exynos5250-usb2.c
 -F:    drivers/phy/samsung/phy-s5pv210-usb2.c
 -F:    drivers/phy/samsung/phy-samsung-usb2.c
 -F:    drivers/phy/samsung/phy-samsung-usb2.h
 -
 -SERIAL DRIVERS
 -M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -L:    linux-serial@vger.kernel.org
 -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>
 -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>
 -S:    Maintained
 -F:    include/linux/dma/dw.h
 -F:    include/linux/platform_data/dma-dw.h
 -F:    drivers/dma/dw/
 -
 -SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
 -M:    Jie Deng <jiedeng@synopsys.com>
 -L:    netdev@vger.kernel.org
 -S:    Supported
 -F:    drivers/net/ethernet/synopsys/
 -
 -SYNOPSYS DESIGNWARE I2C DRIVER
 -M:    Jarkko Nikula <jarkko.nikula@linux.intel.com>
 -R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 -R:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -L:    linux-i2c@vger.kernel.org
 -S:    Maintained
 -F:    drivers/i2c/busses/i2c-designware-*
 -F:    include/linux/platform_data/i2c-designware.h
 -
 -SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 -M:    Jaehoon Chung <jh80.chung@samsung.com>
 -L:    linux-mmc@vger.kernel.org
 -S:    Maintained
 -F:    drivers/mmc/host/dw_mmc*
 -
 -SYSTEM TRACE MODULE CLASS
 -M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
 -F:    Documentation/trace/stm.txt
 -F:    drivers/hwtracing/stm/
 -F:    include/linux/stm.h
 -F:    include/uapi/linux/stm.h
 -
 -TEE SUBSYSTEM
 -M:    Jens Wiklander <jens.wiklander@linaro.org>
 -S:    Maintained
 -F:    include/linux/tee_drv.h
 -F:    include/uapi/linux/tee.h
 -F:    drivers/tee/
 -F:    Documentation/tee.txt
 -
 -THUNDERBOLT DRIVER
 -M:    Andreas Noever <andreas.noever@gmail.com>
 -M:    Michael Jamet <michael.jamet@intel.com>
 -M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 -S:    Maintained
 -F:    drivers/thunderbolt/
 -
 -TI BQ27XXX POWER SUPPLY DRIVER
 -R:    Andrew F. Davis <afd@ti.com>
 -F:    include/linux/power/bq27xxx_battery.h
 -F:    drivers/power/supply/bq27xxx_battery.c
 -F:    drivers/power/supply/bq27xxx_battery_i2c.c
 -
 -TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 -M:    John Stultz <john.stultz@linaro.org>
 -M:    Thomas Gleixner <tglx@linutronix.de>
 -R:    Stephen Boyd <sboyd@codeaurora.org>
 -L:    linux-kernel@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +M:    Vipul Pandya <vipul.pandya@samsung.com>
  S:    Supported
 -F:    include/linux/clocksource.h
 -F:    include/linux/time.h
 -F:    include/linux/timex.h
 -F:    include/uapi/linux/time.h
 -F:    include/uapi/linux/timex.h
 -F:    kernel/time/clocksource.c
 -F:    kernel/time/time*.c
 -F:    kernel/time/alarmtimer.c
 -F:    kernel/time/ntp.c
 -F:    tools/testing/selftests/timers/
 +L:    netdev@vger.kernel.org
 +F:    drivers/net/ethernet/samsung/sxgbe/
  
 -TI TRF7970A NFC DRIVER
 -M:    Mark Greer <mgreer@animalcreek.com>
 -L:    linux-wireless@vger.kernel.org
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +SAMSUNG THERMAL DRIVER
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
 -F:    drivers/nfc/trf7970a.c
 -F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
 +T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 +F:    drivers/thermal/samsung/
 +
 +SAMSUNG USB2 PHY DRIVER
 +M:    Kamil Debski <kamil@wypas.org>
 +M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
 +F:    Documentation/phy/samsung-usb2.txt
 +F:    drivers/phy/samsung/phy-exynos4210-usb2.c
 +F:    drivers/phy/samsung/phy-exynos4x12-usb2.c
 +F:    drivers/phy/samsung/phy-exynos5250-usb2.c
 +F:    drivers/phy/samsung/phy-s5pv210-usb2.c
 +F:    drivers/phy/samsung/phy-samsung-usb2.c
 +F:    drivers/phy/samsung/phy-samsung-usb2.h
  
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <zwanem@gmail.com>
@@@ -11877,6 -11747,16 +11877,6 @@@ 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
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/arm,scpi.txt
 -F:    drivers/clk/clk-scpi.c
 -F:    drivers/cpufreq/scpi-cpufreq.c
 -F:    drivers/firmware/arm_scpi.c
 -F:    include/linux/scpi_protocol.h
 -
  SCSI CDROM DRIVER
  M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-scsi@vger.kernel.org
@@@ -11961,6 -11841,14 +11961,6 @@@ L:  sdricohcs-devel@lists.sourceforge.ne
  S:    Maintained
  F:    drivers/mmc/host/sdricoh_cs.c
  
 -SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -M:    Adrian Hunter <adrian.hunter@intel.com>
 -L:    linux-mmc@vger.kernel.org
 -T:    git git://git.infradead.org/users/ahunter/linux-sdhci.git
 -S:    Maintained
 -F:    drivers/mmc/host/sdhci*
 -F:    include/linux/mmc/sdhci*
 -
  SECURE COMPUTING
  M:    Kees Cook <keescook@chromium.org>
  R:    Andy Lutomirski <luto@amacapital.net>
@@@ -11983,14 -11871,6 +11983,14 @@@ L: bcm-kernel-feedback-list@broadcom.co
  S:    Maintained
  F:    drivers/mmc/host/sdhci-brcmstb*
  
 +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 +M:    Adrian Hunter <adrian.hunter@intel.com>
 +L:    linux-mmc@vger.kernel.org
 +T:    git git://git.infradead.org/users/ahunter/linux-sdhci.git
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci*
 +F:    include/linux/mmc/sdhci*
 +
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
  M:    Ben Dooks <ben-linux@fluff.org>
  M:    Jaehoon Chung <jh80.chung@samsung.com>
@@@ -12015,10 -11895,6 +12015,10 @@@ F: block/opal_proto.
  F:    include/linux/sed*
  F:    include/uapi/linux/sed*
  
 +SECURITY CONTACT
 +M:    Security Officers <security@kernel.org>
 +S:    Supported
 +
  SECURITY SUBSYSTEM
  M:    James Morris <james.l.morris@oracle.com>
  M:    "Serge E. Hallyn" <serge@hallyn.com>
@@@ -12028,46 -11904,79 +12028,46 @@@ W:        http://kernsec.org
  S:    Supported
  F:    security/
  
 -SECURITY CONTACT
 -M:    Security Officers <security@kernel.org>
 -S:    Supported
 -
  SELINUX SECURITY MODULE
  M:    Paul Moore <paul@paul-moore.com>
  M:    Stephen Smalley <sds@tycho.nsa.gov>
  M:    Eric Paris <eparis@parisplace.org>
  L:    selinux@tycho.nsa.gov (moderated for non-subscribers)
 -W:    http://selinuxproject.org
 -T:    git git://git.infradead.org/users/pcmoore/selinux
 +W:    https://selinuxproject.org
 +W:    https://github.com/SELinuxProject
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
  S:    Supported
  F:    include/linux/selinux*
  F:    security/selinux/
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
  
 -APPARMOR SECURITY MODULE
 -M:    John Johansen <john.johansen@canonical.com>
 -L:    apparmor@lists.ubuntu.com (subscribers-only, general discussion)
 -W:    apparmor.wiki.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
 -S:    Supported
 -F:    security/apparmor/
 -F:    Documentation/admin-guide/LSM/apparmor.rst
 -
 -LOADPIN SECURITY MODULE
 -M:    Kees Cook <keescook@chromium.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
 -S:    Supported
 -F:    security/loadpin/
 -F:    Documentation/admin-guide/LSM/LoadPin.rst
 -
 -YAMA SECURITY MODULE
 -M:    Kees Cook <keescook@chromium.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
 -S:    Supported
 -F:    security/yama/
 -F:    Documentation/admin-guide/LSM/Yama.rst
 -
  SENSABLE PHANTOM
  M:    Jiri Slaby <jirislaby@gmail.com>
  S:    Maintained
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 -Emulex 10Gbps iSCSI - OneConnect DRIVER
 -M:    Subbu Seetharaman <subbu.seetharaman@broadcom.com>
 -M:    Ketan Mukadam <ketan.mukadam@broadcom.com>
 -M:    Jitendra Bhivare <jitendra.bhivare@broadcom.com>
 -L:    linux-scsi@vger.kernel.org
 -W:    http://www.broadcom.com
 -S:    Supported
 -F:    drivers/scsi/be2iscsi/
 +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
  
 -Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
 -M:    Sathya Perla <sathya.perla@broadcom.com>
 -M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
 -M:    Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
 -M:    Somnath Kotur <somnath.kotur@broadcom.com>
 -L:    netdev@vger.kernel.org
 -W:    http://www.emulex.com
 -S:    Supported
 -F:    drivers/net/ethernet/emulex/benet/
 +SERIAL DRIVERS
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +L:    linux-serial@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/serial/
 +F:    drivers/tty/serial/
  
 -EMULEX ONECONNECT ROCE DRIVER
 -M:    Selvin Xavier <selvin.xavier@broadcom.com>
 -M:    Devesh Sharma <devesh.sharma@broadcom.com>
 -L:    linux-rdma@vger.kernel.org
 -W:    http://www.broadcom.com
 -S:    Odd Fixes
 -F:    drivers/infiniband/hw/ocrdma/
 -F:    include/uapi/rdma/ocrdma-abi.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
  
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <linux-net-drivers@solarflare.com>
@@@ -12096,24 -12005,6 +12096,24 @@@ M: Robin Holt <robinmholt@gmail.com
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
 +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/
 +
 +SH_VEU V4L2 MEM2MEM DRIVER
 +L:    linux-media@vger.kernel.org
 +S:    Orphan
 +F:    drivers/media/platform/sh_veu.c
 +
 +SH_VOU V4L2 OUTPUT DRIVER
 +L:    linux-media@vger.kernel.org
 +S:    Orphan
 +F:    drivers/media/platform/sh_vou.c
 +F:    include/media/drv-intf/sh_vou.h
 +
  SI2157 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -12193,8 -12084,107 +12193,8 @@@ 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
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/display/simple-framebuffer.txt
 -F:    drivers/video/fbdev/simplefb.c
 -F:    include/linux/platform_data/simplefb.h
 -
 -SH_VEU V4L2 MEM2MEM DRIVER
 -L:    linux-media@vger.kernel.org
 -S:    Orphan
 -F:    drivers/media/platform/sh_veu.c
 -
 -SH_VOU V4L2 OUTPUT DRIVER
 -L:    linux-media@vger.kernel.org
 -S:    Orphan
 -F:    drivers/media/platform/sh_vou.c
 -F:    include/media/drv-intf/sh_vou.h
 -
 -SIMPLE FIRMWARE INTERFACE (SFI)
 -M:    Len Brown <lenb@kernel.org>
 -L:    sfi-devel@simplefirmware.org
 -W:    http://simplefirmware.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
 -S:    Supported
 -F:    arch/x86/platform/sfi/
 -F:    drivers/sfi/
 -F:    include/linux/sfi*.h
 -
 -SIMTEC EB110ATX (Chalice CATS)
 -P:    Ben Dooks
 -P:    Vincent Sanders <vince@simtec.co.uk>
 -M:    Simtec Linux Team <linux@simtec.co.uk>
 -W:    http://www.simtec.co.uk/products/EB110ATX/
 -S:    Supported
 -
 -SIMTEC EB2410ITX (BAST)
 -P:    Ben Dooks
 -P:    Vincent Sanders <vince@simtec.co.uk>
 -M:    Simtec Linux Team <linux@simtec.co.uk>
 -W:    http://www.simtec.co.uk/products/EB2410ITX/
 -S:    Supported
 -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>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
 -S:    Supported
 -F:    arch/arm/mach-davinci/
 -F:    drivers/i2c/busses/i2c-davinci.c
 -F:    arch/arm/boot/dts/da850*
 -
 -TI DAVINCI SERIES MEDIA DRIVER
 -M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
 -L:    linux-media@vger.kernel.org
 -W:    https://linuxtv.org
 -Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -S:    Maintained
 -F:    drivers/media/platform/davinci/
 -F:    include/media/davinci/
 -
 -TI DAVINCI SERIES GPIO DRIVER
 -M:    Keerthy <j-keerthy@ti.com>
 -L:    linux-gpio@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/gpio-davinci.txt
 -F:    drivers/gpio/gpio-davinci.c
 -
 -TI AM437X VPFE DRIVER
 -M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
 -L:    linux-media@vger.kernel.org
 -W:    https://linuxtv.org
 -Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -S:    Maintained
 -F:    drivers/media/platform/am437x/
 -
 -OV2659 OMNIVISION SENSOR DRIVER
 -M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
 -L:    linux-media@vger.kernel.org
 -W:    https://linuxtv.org
 -Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -S:    Maintained
 -F:    drivers/media/i2c/ov2659.c
 -F:    include/media/i2c/ov2659.h
 +F:    drivers/input/touchscreen/silead.c
 +F:    drivers/platform/x86/silead_dmi.c
  
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@@ -12205,48 -12195,6 +12205,48 @@@ S: Maintaine
  F:    drivers/video/fbdev/sm712*
  F:    Documentation/fb/sm712fb.txt
  
 +SIMPLE FIRMWARE INTERFACE (SFI)
 +M:    Len Brown <lenb@kernel.org>
 +L:    sfi-devel@simplefirmware.org
 +W:    http://simplefirmware.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
 +S:    Supported
 +F:    arch/x86/platform/sfi/
 +F:    drivers/sfi/
 +F:    include/linux/sfi*.h
 +
 +SIMPLEFB FB DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/simple-framebuffer.txt
 +F:    drivers/video/fbdev/simplefb.c
 +F:    include/linux/platform_data/simplefb.h
 +
 +SIMTEC EB110ATX (Chalice CATS)
 +P:    Ben Dooks
 +P:    Vincent Sanders <vince@simtec.co.uk>
 +M:    Simtec Linux Team <linux@simtec.co.uk>
 +W:    http://www.simtec.co.uk/products/EB110ATX/
 +S:    Supported
 +
 +SIMTEC EB2410ITX (BAST)
 +P:    Ben Dooks
 +P:    Vincent Sanders <vince@simtec.co.uk>
 +M:    Simtec Linux Team <linux@simtec.co.uk>
 +W:    http://www.simtec.co.uk/products/EB2410ITX/
 +S:    Supported
 +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
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -12307,6 -12255,14 +12307,6 @@@ S:  Maintaine
  F:    Documentation/admin-guide/LSM/Smack.rst
  F:    security/smack/
  
 -DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 -M:    Kevin Hilman <khilman@kernel.org>
 -M:    Nishanth Menon <nm@ti.com>
 -S:    Maintained
 -F:    drivers/power/avs/
 -F:    include/linux/power/smartreflex.h
 -L:    linux-pm@vger.kernel.org
 -
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Odd Fixes
@@@ -12344,12 -12300,6 +12344,12 @@@ S: Supporte
  F:    Documentation/hwmon/sch5627
  F:    drivers/hwmon/sch5627.c
  
 +SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 +M:    Steve Glendinning <steve.glendinning@shawell.net>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/fbdev/smscufx.c
 +
  SMSC47B397 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -12370,6 -12320,12 +12370,6 @@@ L:  netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/smsc/smsc9420.*
  
 -SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 -M:    Steve Glendinning <steve.glendinning@shawell.net>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/video/fbdev/smscufx.c
 -
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
@@@ -12384,15 -12340,6 +12384,15 @@@ M: Chris Boot <bootc@bootc.net
  S:    Maintained
  F:    drivers/leds/leds-net48xx.c
  
 +SOFT-ROCE DRIVER (rxe)
 +M:    Moni Shoua <monis@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Supported
 +W:    https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 +F:    drivers/infiniband/sw/rxe/
 +F:    include/uapi/rdma/rdma_user_rxe.h
 +
  SOFTLOGIC 6x10 MPEG CODEC
  M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
  M:    Anton Sviridenko <anton@corp.bluecherry.net>
@@@ -12425,6 -12372,16 +12425,6 @@@ S:  Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 -SONY VAIO CONTROL DEVICE DRIVER
 -M:    Mattia Dongili <malattia@linux.it>
 -L:    platform-driver-x86@vger.kernel.org
 -W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
 -S:    Maintained
 -F:    Documentation/laptops/sony-laptop.txt
 -F:    drivers/char/sonypi.c
 -F:    drivers/platform/x86/sony-laptop.c
 -F:    include/linux/sony-laptop.h
 -
  SONY MEMORYSTICK CARD SUPPORT
  M:    Alex Dubov <oakad@yahoo.com>
  W:    http://tifmxx.berlios.de/
@@@ -12436,16 -12393,6 +12436,16 @@@ M: Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/memstick/core/ms_block.*
  
 +SONY VAIO CONTROL DEVICE DRIVER
 +M:    Mattia Dongili <malattia@linux.it>
 +L:    platform-driver-x86@vger.kernel.org
 +W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
 +S:    Maintained
 +F:    Documentation/laptops/sony-laptop.txt
 +F:    drivers/char/sonypi.c
 +F:    drivers/platform/x86/sony-laptop.c
 +F:    include/linux/sony-laptop.h
 +
  SOUND
  M:    Jaroslav Kysela <perex@perex.cz>
  M:    Takashi Iwai <tiwai@suse.com>
@@@ -12471,13 -12418,6 +12471,13 @@@ F: include/uapi/sound/compress_
  F:    sound/core/compress_offload.c
  F:    sound/soc/soc-compress.c
  
 +SOUND - DMAENGINE HELPERS
 +M:    Lars-Peter Clausen <lars@metafoo.de>
 +S:    Supported
 +F:    include/sound/dmaengine_pcm.h
 +F:    sound/core/pcm_dmaengine.c
 +F:    sound/soc/soc-generic-dmaengine-pcm.c
 +
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lgirdwood@gmail.com>
  M:    Mark Brown <broonie@kernel.org>
@@@ -12490,6 -12430,13 +12490,6 @@@ F:  Documentation/sound/alsa/soc
  F:    sound/soc/
  F:    include/sound/soc*
  
 -SOUND - DMAENGINE HELPERS
 -M:    Lars-Peter Clausen <lars@metafoo.de>
 -S:    Supported
 -F:    include/sound/dmaengine_pcm.h
 -F:    sound/core/pcm_dmaengine.c
 -F:    sound/soc/soc-generic-dmaengine-pcm.c
 -
  SP2 MEDIA DRIVER
  M:    Olli Salonen <olli.salonen@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -12522,7 -12469,6 +12522,7 @@@ F:   drivers/tty/serial/sunsab.
  F:    drivers/tty/serial/sunsu.c
  F:    drivers/tty/serial/sunzilog.c
  F:    drivers/tty/serial/sunzilog.h
 +F:    drivers/tty/vcc.c
  
  SPARSE CHECKER
  M:    "Christopher Li" <sparse@chrisli.org>
@@@ -12533,21 -12479,21 +12533,21 @@@ T:        git git://git.kernel.org/pub/scm/dev
  S:    Maintained
  F:    include/linux/compiler.h
  
 -SPEAR PLATFORM SUPPORT
 +SPEAR CLOCK FRAMEWORK SUPPORT
  M:    Viresh Kumar <vireshk@kernel.org>
 -M:    Shiraz Hashim <shiraz.linux.kernel@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
 -F:    arch/arm/boot/dts/spear*
 -F:    arch/arm/mach-spear/
 +F:    drivers/clk/spear/
  
 -SPEAR CLOCK FRAMEWORK SUPPORT
 +SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <vireshk@kernel.org>
 +M:    Shiraz Hashim <shiraz.linux.kernel@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
 -F:    drivers/clk/spear/
 +F:    arch/arm/boot/dts/spear*
 +F:    arch/arm/mach-spear/
  
  SPI NOR SUBSYSTEM
  M:    Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
@@@ -12581,15 -12527,6 +12581,15 @@@ S: Supporte
  F:    Documentation/networking/spider_net.txt
  F:    drivers/net/ethernet/toshiba/spider_net*
  
 +SPMI SUBSYSTEM
 +R:    Stephen Boyd <sboyd@codeaurora.org>
 +L:    linux-arm-msm@vger.kernel.org
 +F:    Documentation/devicetree/bindings/spmi/
 +F:    drivers/spmi/
 +F:    include/dt-bindings/spmi/spmi.h
 +F:    include/linux/spmi.h
 +F:    include/trace/events/spmi.h
 +
  SPU FILE SYSTEM
  M:    Jeremy Kerr <jk@ozlabs.org>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -12618,6 -12555,13 +12618,6 @@@ L:  stable@vger.kernel.or
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
  
 -STAGING SUBSYSTEM
 -M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 -L:    devel@driverdev.osuosl.org
 -S:    Supported
 -F:    drivers/staging/
 -
  STAGING - COMEDI
  M:    Ian Abbott <abbotti@mev.co.uk>
  M:    H Hartley Sweeten <hsweeten@visionengravers.com>
@@@ -12707,45 -12651,11 +12707,45 @@@ M:        Arnaud Patard <arnaud.patard@rtp-net
  S:    Odd Fixes
  F:    drivers/staging/xgifb/
  
 +STAGING SUBSYSTEM
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 +L:    devel@driverdev.osuosl.org
 +S:    Supported
 +F:    drivers/staging/
 +
  STARFIRE/DURALAN NETWORK DRIVER
  M:    Ion Badulescu <ionut@badula.org>
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STEC S1220 SKD DRIVER
 +M:    Bart Van Assche <bart.vanassche@wdc.com>
 +L:    linux-block@vger.kernel.org
 +S:    Maintained
 +F:    drivers/block/skd*[ch]
 +
 +STI CEC DRIVER
 +M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +S:    Maintained
 +F:    drivers/staging/media/st-cec/
 +F:    Documentation/devicetree/bindings/media/stih-cec.txt
 +
 +STK1160 USB VIDEO CAPTURE DRIVER
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/stk1160/
 +
 +STMMAC ETHERNET DRIVER
 +M:    Giuseppe Cavallaro <peppe.cavallaro@st.com>
 +M:    Alexandre Torgue <alexandre.torgue@st.com>
 +L:    netdev@vger.kernel.org
 +W:    http://www.stlinux.com
 +S:    Supported
 +F:    drivers/net/ethernet/stmicro/stmmac/
 +
  SUN3/3X
  M:    Sam Creasey <sammy@sammy.net>
  W:    http://sammy.net/sun3/
@@@ -12817,20 -12727,6 +12817,20 @@@ S: Supporte
  F:    net/switchdev/
  F:    include/net/switchdev.h
  
 +SYNC FILE FRAMEWORK
 +M:    Sumit Semwal <sumit.semwal@linaro.org>
 +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_*
 +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://anongit.freedesktop.org/drm/drm-misc
 +
  SYNOPSYS ARC ARCHITECTURE
  M:    Vineet Gupta <vgupta@synopsys.com>
  L:    linux-snps-arc@lists.infradead.org
@@@ -12842,6 -12738,12 +12842,18 @@@ F: drivers/clocksource/arc_timer.
  F:    drivers/tty/serial/arc_uart.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
  
+ SYNOPSYS ARC HSDK SDP pll clock driver
+ M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
+ S:    Supported
+ F:    drivers/clk/clk-hsdk-pll.c
+ F:    Documentation/devicetree/bindings/clock/snps,hsdk-pll-clock.txt
+ 
++SYNOPSYS ARC SDP clock driver
++M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
++S:    Supported
++F:    drivers/clk/axs10x/*
++F:    Documentation/devicetree/bindings/clock/snps,pll-clock.txt
++
  SYNOPSYS ARC SDP platform support
  M:    Alexey Brodkin <abrodkin@synopsys.com>
  S:    Supported
@@@ -12849,41 -12751,11 +12861,41 @@@ F:        arch/arc/plat-axs10
  F:    arch/arc/boot/dts/ax*
  F:    Documentation/devicetree/bindings/arc/axs10*
  
 -SYNOPSYS ARC SDP clock driver
 +SYNOPSYS DESIGNWARE DMAC DRIVER
 +M:    Viresh Kumar <vireshk@kernel.org>
 +M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +S:    Maintained
 +F:    include/linux/dma/dw.h
 +F:    include/linux/platform_data/dma-dw.h
 +F:    drivers/dma/dw/
 +
 +SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
 +M:    Jie Deng <jiedeng@synopsys.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/synopsys/
 +
 +SYNOPSYS DESIGNWARE I2C DRIVER
 +M:    Jarkko Nikula <jarkko.nikula@linux.intel.com>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +R:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-designware-*
 +F:    include/linux/platform_data/i2c-designware.h
 +
 +SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 +M:    Jaehoon Chung <jh80.chung@samsung.com>
 +L:    linux-mmc@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/dw_mmc*
 +
 +SYNOPSYS HSDK RESET CONTROLLER DRIVER
  M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
  S:    Supported
 -F:    drivers/clk/axs10x/*
 -F:    Documentation/devicetree/bindings/clock/snps,pll-clock.txt
 +F:    drivers/reset/reset-hsdk-v1.c
 +F:    include/dt-bindings/reset/snps,hsdk-v1-reset.h
 +F:    Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
  
  SYSTEM CONFIGURATION (SYSCON)
  M:    Lee Jones <lee.jones@linaro.org>
@@@ -12892,16 -12764,6 +12904,16 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/mfd/syscon.c
  
 +SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
 +M:    Sudeep Holla <sudeep.holla@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/arm,scpi.txt
 +F:    drivers/clk/clk-scpi.c
 +F:    drivers/cpufreq/scpi-cpufreq.c
 +F:    drivers/firmware/arm_scpi.c
 +F:    include/linux/scpi_protocol.h
 +
  SYSTEM RESET/SHUTDOWN DRIVERS
  M:    Sebastian Reichel <sre@kernel.org>
  L:    linux-pm@vger.kernel.org
@@@ -12910,15 -12772,6 +12922,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/power/reset/
  F:    drivers/power/reset/
  
 +SYSTEM TRACE MODULE CLASS
 +M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
 +F:    Documentation/trace/stm.txt
 +F:    drivers/hwtracing/stm/
 +F:    include/linux/stm.h
 +F:    include/uapi/linux/stm.h
 +
  SYSV FILESYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
  S:    Maintained
@@@ -13088,14 -12941,6 +13100,14 @@@ L: linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/rc/ttusbir.c
  
 +TEE SUBSYSTEM
 +M:    Jens Wiklander <jens.wiklander@linaro.org>
 +S:    Maintained
 +F:    include/linux/tee_drv.h
 +F:    include/uapi/linux/tee.h
 +F:    drivers/tee/
 +F:    Documentation/tee.txt
 +
  TEGRA ARCHITECTURE SUPPORT
  M:    Thierry Reding <thierry.reding@gmail.com>
  M:    Jonathan Hunter <jonathanh@nvidia.com>
@@@ -13225,29 -13070,7 +13237,29 @@@ W: http://ibm-acpi.sourceforge.ne
  W:    http://thinkwiki.org/wiki/Ibm-acpi
  T:    git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
  S:    Maintained
 -F:    drivers/platform/x86/thinkpad_acpi.c
 +F:    drivers/platform/x86/thinkpad_acpi.c
 +
 +THUNDERBOLT DRIVER
 +M:    Andreas Noever <andreas.noever@gmail.com>
 +M:    Michael Jamet <michael.jamet@intel.com>
 +M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +S:    Maintained
 +F:    drivers/thunderbolt/
 +
 +THUNDERX GPIO DRIVER
 +M:    David Daney <david.daney@cavium.com>
 +S:    Maintained
 +F:    drivers/gpio/gpio-thunderx.c
 +
 +TI AM437X VPFE DRIVER
 +M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 +S:    Maintained
 +F:    drivers/media/platform/am437x/
  
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <edubezval@gmail.com>
@@@ -13257,11 -13080,13 +13269,11 @@@ L:        linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
 -TI VPE/CAL DRIVERS
 -M:    Benoit Parrot <bparrot@ti.com>
 -L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 -Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -S:    Maintained
 -F:    drivers/media/platform/ti-vpe/
 +TI BQ27XXX POWER SUPPLY DRIVER
 +R:    Andrew F. Davis <afd@ti.com>
 +F:    include/linux/power/bq27xxx_battery.h
 +F:    drivers/power/supply/bq27xxx_battery.c
 +F:    drivers/power/supply/bq27xxx_battery_i2c.c
  
  TI CDCE706 CLOCK DRIVER
  M:    Max Filippov <jcmvbkbc@gmail.com>
@@@ -13275,33 -13100,6 +13287,33 @@@ S: Maintaine
  F:    drivers/clk/ti/
  F:    include/linux/clk/ti.h
  
 +TI DAVINCI MACHINE SUPPORT
 +M:    Sekhar Nori <nsekhar@ti.com>
 +M:    Kevin Hilman <khilman@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
 +S:    Supported
 +F:    arch/arm/mach-davinci/
 +F:    drivers/i2c/busses/i2c-davinci.c
 +F:    arch/arm/boot/dts/da850*
 +
 +TI DAVINCI SERIES GPIO DRIVER
 +M:    Keerthy <j-keerthy@ti.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/gpio-davinci.txt
 +F:    drivers/gpio/gpio-davinci.c
 +
 +TI DAVINCI SERIES MEDIA DRIVER
 +M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 +S:    Maintained
 +F:    drivers/media/platform/davinci/
 +F:    include/media/davinci/
 +
  TI ETHERNET SWITCH DRIVER (CPSW)
  R:    Grygorii Strashko <grygorii.strashko@ti.com>
  L:    linux-omap@vger.kernel.org
@@@ -13325,6 -13123,7 +13337,6 @@@ S:   Maintaine
  F:    drivers/soc/ti/*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
 -
  TI LM49xxx FAMILY ASoC CODEC DRIVERS
  M:    M R Swami Reddy <mr.swami.reddy@ti.com>
  M:    Vishwas A Deshpande <vishwas.a.deshpande@ti.com>
@@@ -13369,28 -13168,12 +13381,28 @@@ L:        alsa-devel@alsa-project.org (moderat
  S:    Odd Fixes
  F:    sound/soc/codecs/tas571x*
  
 +TI TRF7970A NFC DRIVER
 +M:    Mark Greer <mgreer@animalcreek.com>
 +L:    linux-wireless@vger.kernel.org
 +L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/trf7970a.c
 +F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
  
 +TI VPE/CAL DRIVERS
 +M:    Benoit Parrot <bparrot@ti.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/platform/ti-vpe/
 +
  TI WILINK WIRELESS DRIVERS
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
@@@ -13400,6 -13183,16 +13412,6 @@@ S:  Orpha
  F:    drivers/net/wireless/ti/
  F:    include/linux/wl12xx.h
  
 -TIPC NETWORK LAYER
 -M:    Jon Maloy <jon.maloy@ericsson.com>
 -M:    Ying Xue <ying.xue@windriver.com>
 -L:    netdev@vger.kernel.org (core kernel code)
 -L:    tipc-discussion@lists.sourceforge.net (user apps, general discussion)
 -W:    http://tipc.sourceforge.net/
 -S:    Maintained
 -F:    include/uapi/linux/tipc*.h
 -F:    net/tipc/
 -
  TILE ARCHITECTURE
  M:    Chris Metcalf <cmetcalf@mellanox.com>
  W:    http://www.mellanox.com/repository/solutions/tile-scm/
@@@ -13415,34 -13208,6 +13427,34 @@@ F: drivers/tty/serial/tilegx.
  F:    drivers/usb/host/*-tilegx.c
  F:    include/linux/usb/tilegx.h
  
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 +M:    John Stultz <john.stultz@linaro.org>
 +M:    Thomas Gleixner <tglx@linutronix.de>
 +R:    Stephen Boyd <sboyd@codeaurora.org>
 +L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +S:    Supported
 +F:    include/linux/clocksource.h
 +F:    include/linux/time.h
 +F:    include/linux/timex.h
 +F:    include/uapi/linux/time.h
 +F:    include/uapi/linux/timex.h
 +F:    kernel/time/clocksource.c
 +F:    kernel/time/time*.c
 +F:    kernel/time/alarmtimer.c
 +F:    kernel/time/ntp.c
 +F:    tools/testing/selftests/timers/
 +
 +TIPC NETWORK LAYER
 +M:    Jon Maloy <jon.maloy@ericsson.com>
 +M:    Ying Xue <ying.xue@windriver.com>
 +L:    netdev@vger.kernel.org (core kernel code)
 +L:    tipc-discussion@lists.sourceforge.net (user apps, general discussion)
 +W:    http://tipc.sourceforge.net/
 +S:    Maintained
 +F:    include/uapi/linux/tipc*.h
 +F:    net/tipc/
 +
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <chessman@tux.org>
  L:    tlan-devel@lists.sourceforge.net (subscribers-only)
@@@ -13451,38 -13216,6 +13463,38 @@@ S: Maintaine
  F:    Documentation/networking/tlan.txt
  F:    drivers/net/ethernet/ti/tlan.*
  
 +TM6000 VIDEO4LINUX DRIVER
 +M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
 +M:    Mauro Carvalho Chehab <mchehab@kernel.org>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd fixes
 +F:    drivers/media/usb/tm6000/
 +F:    Documentation/media/v4l-drivers/tm6000*
 +
 +TMIO/SDHI MMC DRIVER
 +M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
 +L:    linux-mmc@vger.kernel.org
 +S:    Supported
 +F:    drivers/mmc/host/tmio_mmc*
 +F:    drivers/mmc/host/renesas_sdhi*
 +F:    include/linux/mfd/tmio.h
 +
 +TMP401 HARDWARE MONITOR DRIVER
 +M:    Guenter Roeck <linux@roeck-us.net>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hwmon/tmp401
 +F:    drivers/hwmon/tmp401.c
 +
 +TMPFS (SHMEM FILESYSTEM)
 +M:    Hugh Dickins <hughd@google.com>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    include/linux/shmem_fs.h
 +F:    mm/shmem.c
 +
  TOMOYO SECURITY MODULE
  M:    Kentaro Takeda <takedakn@nttdata.co.jp>
  M:    Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
@@@ -13519,6 -13252,12 +13531,6 @@@ L:  platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/toshiba_haps.c
  
 -TOSHIBA WMI HOTKEYS DRIVER
 -M:    Azael Avalos <coproscefalo@gmail.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/toshiba-wmi.c
 -
  TOSHIBA SMM DRIVER
  M:    Jonathan Buzzard <jonathan@buzzard.org.uk>
  W:    http://www.buzzard.org.uk/toshiba/
@@@ -13534,11 -13273,62 +13546,11 @@@ S:        Maintaine
  F:    drivers/media/i2c/tc358743*
  F:    include/media/i2c/tc358743.h
  
 -TMIO/SDHI MMC DRIVER
 -M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
 -L:    linux-mmc@vger.kernel.org
 -S:    Supported
 -F:    drivers/mmc/host/tmio_mmc*
 -F:    drivers/mmc/host/renesas_sdhi*
 -F:    include/linux/mfd/tmio.h
 -
 -TMP401 HARDWARE MONITOR DRIVER
 -M:    Guenter Roeck <linux@roeck-us.net>
 -L:    linux-hwmon@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/hwmon/tmp401
 -F:    drivers/hwmon/tmp401.c
 -
 -TMPFS (SHMEM FILESYSTEM)
 -M:    Hugh Dickins <hughd@google.com>
 -L:    linux-mm@kvack.org
 -S:    Maintained
 -F:    include/linux/shmem_fs.h
 -F:    mm/shmem.c
 -
 -TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
 -M:    Mauro Carvalho Chehab <mchehab@kernel.org>
 -L:    linux-media@vger.kernel.org
 -W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Odd fixes
 -F:    drivers/media/usb/tm6000/
 -F:    Documentation/media/v4l-drivers/tm6000*
 -
 -TW5864 VIDEO4LINUX DRIVER
 -M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 -M:    Anton Sviridenko <anton@corp.bluecherry.net>
 -M:    Andrey Utkin <andrey.utkin@corp.bluecherry.net>
 -M:    Andrey Utkin <andrey_utkin@fastmail.com>
 -L:    linux-media@vger.kernel.org
 -S:    Supported
 -F:    drivers/media/pci/tw5864/
 -
 -TW68 VIDEO4LINUX DRIVER
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    https://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/pci/tw68/
 -
 -TW686X VIDEO4LINUX DRIVER
 -M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +TOSHIBA WMI HOTKEYS DRIVER
 +M:    Azael Avalos <coproscefalo@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/pci/tw686x/
 +F:    drivers/platform/x86/toshiba-wmi.c
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <peterhuewe@gmx.de>
@@@ -13640,31 -13430,6 +13652,31 @@@ S: Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 +TW5864 VIDEO4LINUX DRIVER
 +M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 +M:    Anton Sviridenko <anton@corp.bluecherry.net>
 +M:    Andrey Utkin <andrey.utkin@corp.bluecherry.net>
 +M:    Andrey Utkin <andrey_utkin@fastmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Supported
 +F:    drivers/media/pci/tw5864/
 +
 +TW68 VIDEO4LINUX DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    https://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/pci/tw68/
 +
 +TW686X VIDEO4LINUX DRIVER
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/pci/tw686x/
 +
  UBI FILE SYSTEM (UBIFS)
  M:    Richard Weinberger <richard@nod.at>
  M:    Artem Bityutskiy <dedekind1@gmail.com>
@@@ -13714,13 -13479,6 +13726,13 @@@ S: Maintaine
  F:    drivers/hid/uhid.c
  F:    include/uapi/linux/uhid.h
  
 +ULPI BUS
 +M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/common/ulpi.c
 +F:    include/linux/ulpi/
 +
  ULTRA-WIDEBAND (UWB) SUBSYSTEM:
  L:    linux-usb@vger.kernel.org
  S:    Orphan
@@@ -13764,7 -13522,8 +13776,7 @@@ F:   Documentation/scsi/ufs.tx
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 -M:    Manjunath M Bettegowda <manjumb@synopsys.com>
 -M:    Prabu Thangamuthu <prabut@synopsys.com>
 +M:    Joao Pinto <jpinto@synopsys.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
@@@ -13780,14 -13539,6 +13792,14 @@@ F: drivers/mtd/ubi
  F:    include/linux/mtd/ubi.h
  F:    include/uapi/mtd/ubi-user.h
  
 +USB "USBNET" DRIVER FRAMEWORK
 +M:    Oliver Neukum <oneukum@suse.com>
 +L:    netdev@vger.kernel.org
 +W:    http://www.linux-usb.org/usbnet
 +S:    Maintained
 +F:    drivers/net/usb/usbnet.c
 +F:    include/linux/usb/usbnet.h
 +
  USB ACM DRIVER
  M:    Oliver Neukum <oneukum@suse.com>
  L:    linux-usb@vger.kernel.org
@@@ -14011,6 -13762,14 +14023,6 @@@ L:  linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/host/uhci*
  
 -USB "USBNET" DRIVER FRAMEWORK
 -M:    Oliver Neukum <oneukum@suse.com>
 -L:    netdev@vger.kernel.org
 -W:    http://www.linux-usb.org/usbnet
 -S:    Maintained
 -F:    drivers/net/usb/usbnet.c
 -F:    include/linux/usb/usbnet.h
 -
  USB VIDEO CLASS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-uvc-devel@lists.sourceforge.net (subscribers-only)
@@@ -14061,9 -13820,16 +14073,9 @@@ L:  linux-usb@vger.kernel.or
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  W:    http://royale.zerezo.com/zr364xx/
 -S:    Maintained
 -F:    Documentation/media/v4l-drivers/zr364xx*
 -F:    drivers/media/usb/zr364xx/
 -
 -ULPI BUS
 -M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 -L:    linux-usb@vger.kernel.org
 -S:    Maintained
 -F:    drivers/usb/common/ulpi.c
 -F:    include/linux/ulpi/
 +S:    Maintained
 +F:    Documentation/media/v4l-drivers/zr364xx*
 +F:    drivers/media/usb/zr364xx/
  
  USER-MODE LINUX (UML)
  M:    Jeff Dike <jdike@addtoit.com>
@@@ -14158,37 -13924,6 +14170,37 @@@ F: drivers/gpu/vga/vga_switcheroo.
  F:    include/linux/vga_switcheroo.h
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +VIA RHINE NETWORK DRIVER
 +S:    Orphan
 +F:    drivers/net/ethernet/via/via-rhine.c
 +
 +VIA SD/MMC CARD CONTROLLER DRIVER
 +M:    Bruce Chang <brucechang@via.com.tw>
 +M:    Harald Welte <HaraldWelte@viatech.com>
 +S:    Maintained
 +F:    drivers/mmc/host/via-sdmmc.c
 +
 +VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 +M:    Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    include/linux/via-core.h
 +F:    include/linux/via-gpio.h
 +F:    include/linux/via_i2c.h
 +F:    drivers/video/fbdev/via/
 +
 +VIA VELOCITY NETWORK DRIVER
 +M:    Francois Romieu <romieu@fr.zoreil.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/via/via-velocity.*
 +
 +VIDEO MULTIPLEXER DRIVER
 +M:    Philipp Zabel <p.zabel@pengutronix.de>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/video-mux.c
 +
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@osciak.com>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -14198,20 -13933,11 +14210,20 @@@ S:        Maintaine
  F:    drivers/media/v4l2-core/videobuf2-*
  F:    include/media/videobuf2-*
  
 -VIDEO MULTIPLEXER DRIVER
 -M:    Philipp Zabel <p.zabel@pengutronix.de>
 +VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 +M:    Helen Koike <helen.koike@collabora.com>
  L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    https://linuxtv.org
  S:    Maintained
 -F:    drivers/media/platform/video-mux.c
 +F:    drivers/media/platform/vimc/*
 +
 +VIRT LIB
 +M:    Alex Williamson <alex.williamson@redhat.com>
 +M:    Paolo Bonzini <pbonzini@redhat.com>
 +L:    kvm@vger.kernel.org
 +S:    Supported
 +F:    virt/lib/
  
  VIRTIO AND VHOST VSOCK DRIVER
  M:    Stefan Hajnoczi <stefanha@redhat.com>
@@@ -14229,6 -13955,12 +14241,6 @@@ F:  drivers/net/vsockmon.
  F:    drivers/vhost/vsock.c
  F:    drivers/vhost/vsock.h
  
 -VIRTUAL SERIO DEVICE DRIVER
 -M:    Stephen Chandler Paul <thatslyude@gmail.com>
 -S:    Maintained
 -F:    drivers/input/serio/userio.c
 -F:    include/uapi/linux/userio.h
 -
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <amit@kernel.org>
  L:    virtualization@lists.linux-foundation.org
@@@ -14250,15 -13982,6 +14262,15 @@@ F: drivers/block/virtio_blk.
  F:    include/linux/virtio*.h
  F:    include/uapi/linux/virtio_*.h
  F:    drivers/crypto/virtio/
 +F:    mm/balloon_compaction.c
 +
 +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
  
  VIRTIO DRIVERS FOR S390
  M:    Cornelia Huck <cohuck@redhat.com>
@@@ -14296,11 -14019,45 +14308,11 @@@ S:        Maintaine
  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
 -
 -VIA SD/MMC CARD CONTROLLER DRIVER
 -M:    Bruce Chang <brucechang@via.com.tw>
 -M:    Harald Welte <HaraldWelte@viatech.com>
 -S:    Maintained
 -F:    drivers/mmc/host/via-sdmmc.c
 -
 -VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 -M:    Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    include/linux/via-core.h
 -F:    include/linux/via-gpio.h
 -F:    include/linux/via_i2c.h
 -F:    drivers/video/fbdev/via/
 -
 -VIA VELOCITY NETWORK DRIVER
 -M:    Francois Romieu <romieu@fr.zoreil.com>
 -L:    netdev@vger.kernel.org
 +VIRTUAL SERIO DEVICE DRIVER
 +M:    Stephen Chandler Paul <thatslyude@gmail.com>
  S:    Maintained
 -F:    drivers/net/ethernet/via/via-velocity.*
 -
 -VIRT LIB
 -M:    Alex Williamson <alex.williamson@redhat.com>
 -M:    Paolo Bonzini <pbonzini@redhat.com>
 -L:    kvm@vger.kernel.org
 -S:    Supported
 -F:    virt/lib/
 +F:    drivers/input/serio/userio.c
 +F:    include/uapi/linux/userio.h
  
  VIVID VIRTUAL VIDEO DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -14310,6 -14067,14 +14322,6 @@@ W:  https://linuxtv.or
  S:    Maintained
  F:    drivers/media/platform/vivid/*
  
 -VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 -M:    Helen Koike <helen.koike@collabora.com>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    https://linuxtv.org
 -S:    Maintained
 -F:    drivers/media/platform/vimc/*
 -
  VLYNQ BUS
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    openwrt-devel@lists.openwrt.org (subscribers-only)
@@@ -14329,6 -14094,12 +14341,6 @@@ F:  drivers/staging/vme
  F:    drivers/vme/
  F:    include/linux/vme*
  
 -VMWARE HYPERVISOR INTERFACE
 -M:    Alok Kataria <akataria@vmware.com>
 -L:    virtualization@lists.linux-foundation.org
 -S:    Supported
 -F:    arch/x86/kernel/cpu/vmware.c
 -
  VMWARE BALLOON DRIVER
  M:    Xavier Deguillard <xdeguillard@vmware.com>
  M:    Philip Moltmann <moltmann@vmware.com>
@@@ -14337,27 -14108,6 +14349,27 @@@ L: linux-kernel@vger.kernel.or
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
 +VMWARE HYPERVISOR INTERFACE
 +M:    Alok Kataria <akataria@vmware.com>
 +L:    virtualization@lists.linux-foundation.org
 +S:    Supported
 +F:    arch/x86/kernel/cpu/vmware.c
 +
 +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/
 +
 +VMware PVSCSI driver
 +M:    Jim Gill <jgill@vmware.com>
 +M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/scsi/vmw_pvscsi.c
 +F:    drivers/scsi/vmw_pvscsi.h
 +
  VMWARE VMMOUSE SUBDRIVER
  M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
@@@ -14373,6 -14123,21 +14385,6 @@@ L:  netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/vmxnet3/
  
 -VMware PVSCSI driver
 -M:    Jim Gill <jgill@vmware.com>
 -M:    VMware PV-Drivers <pv-drivers@vmware.com>
 -L:    linux-scsi@vger.kernel.org
 -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>
@@@ -14465,39 -14230,12 +14477,39 @@@ F:        drivers/watchdog
  F:    include/linux/watchdog.h
  F:    include/uapi/linux/watchdog.h
  
 +WHISKEYCOVE PMIC GPIO DRIVER
 +M:    Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-wcove.c
 +
  WIIMOTE HID DRIVER
  M:    David Herrmann <dh.herrmann@googlemail.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
  F:    drivers/hid/hid-wiimote*
  
 +WILOCITY WIL6210 WIRELESS DRIVER
 +M:    Maya Erez <qca_merez@qca.qualcomm.com>
 +L:    linux-wireless@vger.kernel.org
 +L:    wil6210@qca.qualcomm.com
 +S:    Supported
 +W:    http://wireless.kernel.org/en/users/Drivers/wil6210
 +F:    drivers/net/wireless/ath/wil6210/
 +F:    include/uapi/linux/wil6210_uapi.h
 +
 +WIMAX STACK
 +M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 +M:    linux-wimax@intel.com
 +L:    wimax@linuxwimax.org (subscribers-only)
 +S:    Supported
 +W:    http://linuxwimax.org
 +F:    Documentation/wimax/README.wimax
 +F:    include/linux/wimax/debug.h
 +F:    include/net/wimax.h
 +F:    include/uapi/linux/wimax.h
 +F:    net/wimax/
 +
  WINBOND CIR DRIVER
  M:    David Härdeman <david@hardeman.nu>
  S:    Maintained
@@@ -14515,6 -14253,18 +14527,6 @@@ L:  linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-ws16c48.c
  
 -WIMAX STACK
 -M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 -M:    linux-wimax@intel.com
 -L:    wimax@linuxwimax.org (subscribers-only)
 -S:    Supported
 -W:    http://linuxwimax.org
 -F:    Documentation/wimax/README.wimax
 -F:    include/linux/wimax/debug.h
 -F:    include/net/wimax.h
 -F:    include/uapi/linux/wimax.h
 -F:    net/wimax/
 -
  WISTRON LAPTOP BUTTON DRIVER
  M:    Miloslav Trmac <mitr@volny.cz>
  S:    Maintained
@@@ -14599,6 -14349,15 +14611,6 @@@ S:  Maintaine
  F:    Documentation/x86/
  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
 -F:    drivers/platform/x86/
 -F:    drivers/platform/olpc/
 -
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <tony.luck@intel.com>
  M:    Borislav Petkov <bp@alien8.de>
@@@ -14611,15 -14370,6 +14623,15 @@@ M: Borislav Petkov <bp@alien8.de
  S:    Maintained
  F:    arch/x86/kernel/cpu/microcode/*
  
 +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
 +F:    drivers/platform/x86/
 +F:    drivers/platform/olpc/
 +
  X86 VDSO
  M:    Andy Lutomirski <luto@amacapital.net>
  L:    linux-kernel@vger.kernel.org
@@@ -14636,13 -14386,20 +14648,13 @@@ T:        git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
  
 -XEN HYPERVISOR INTERFACE
 -M:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
 -M:    Juergen Gross <jgross@suse.com>
 +XEN BLOCK SUBSYSTEM
 +M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Roger Pau Monné <roger.pau@citrix.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
  S:    Supported
 -F:    arch/x86/xen/
 -F:    drivers/*/xen-*front.c
 -F:    drivers/xen/
 -F:    arch/x86/include/asm/xen/
 -F:    include/xen/
 -F:    include/uapi/xen/
 -F:    Documentation/ABI/stable/sysfs-hypervisor-xen
 -F:    Documentation/ABI/testing/sysfs-hypervisor-xen
 +F:    drivers/block/xen-blkback/*
 +F:    drivers/block/xen*
  
  XEN HYPERVISOR ARM
  M:    Stefano Stabellini <sstabellini@kernel.org>
@@@ -14658,21 -14415,6 +14670,21 @@@ S: Maintaine
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/
  
 +XEN HYPERVISOR INTERFACE
 +M:    Boris Ostrovsky <boris.ostrovsky@oracle.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
 +S:    Supported
 +F:    arch/x86/xen/
 +F:    drivers/*/xen-*front.c
 +F:    drivers/xen/
 +F:    arch/x86/include/asm/xen/
 +F:    include/xen/
 +F:    include/uapi/xen/
 +F:    Documentation/ABI/stable/sysfs-hypervisor-xen
 +F:    Documentation/ABI/testing/sysfs-hypervisor-xen
 +
  XEN NETWORK BACKEND DRIVER
  M:    Wei Liu <wei.liu2@citrix.com>
  M:    Paul Durrant <paul.durrant@citrix.com>
@@@ -14688,6 -14430,14 +14700,6 @@@ S:  Supporte
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
 -XEN BLOCK SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -M:    Roger Pau Monné <roger.pau@citrix.com>
 -L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/block/xen-blkback/*
 -F:    drivers/block/xen*
 -
  XEN PVSCSI DRIVERS
  M:    Juergen Gross <jgross@suse.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
@@@ -14764,13 -14514,6 +14776,13 @@@ S: Maintaine
  F:    drivers/net/hamradio/yam*
  F:    include/linux/yam.h
  
 +YAMA SECURITY MODULE
 +M:    Kees Cook <keescook@chromium.org>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
 +S:    Supported
 +F:    security/yama/
 +F:    Documentation/admin-guide/LSM/Yama.rst
 +
  YEALINK PHONE DRIVER
  M:    Henk Vergonet <Henk.Vergonet@gmail.com>
  L:    usbb2k-api-dev@nongnu.org
@@@ -14805,23 -14548,23 +14817,23 @@@ L:        zd1211-devs@lists.sourceforge.net (s
  S:    Maintained
  F:    drivers/net/wireless/zydas/zd1211rw/
  
 -ZD1301_DEMOD MEDIA DRIVER
 +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/dvb-frontends/zd1301_demod*
 +F:    drivers/media/usb/dvb-usb-v2/zd1301*
  
 -ZD1301 MEDIA DRIVER
 +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/usb/dvb-usb-v2/zd1301*
 +F:    drivers/media/dvb-frontends/zd1301_demod*
  
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <ddstreet@ieee.org>

diff --combined arch/arm/mach-at91/Kconfig
index 195da38cb9a220f22c2f890c5bcb8fc1f2c7c621,9ae14d59a9ce9ec5d061907539cfbb8310c943ac..6d870421a7a64d2e3aa615746307e4d4254058f8
--- 1/arch/arm/mach-at91/Kconfig
--- 2/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@@ -1,7 -1,7 +1,7 @@@
  menuconfig ARCH_AT91
        bool "Atmel SoCs"
        depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
 -      select ARM_CPU_SUSPEND if PM
 +      select ARM_CPU_SUSPEND if PM && ARCH_MULTI_V7
        select COMMON_CLK_AT91
        select GPIOLIB
        select PINCTRL
@@@ -26,6 -26,7 +26,7 @@@ config SOC_SAMA5D
        select HAVE_AT91_USB_CLK
        select HAVE_AT91_H32MX
        select HAVE_AT91_GENERATED_CLK
+       select HAVE_AT91_AUDIO_PLL
        select PINCTRL_AT91PIO4
        help
          Select this if ou are using one of Atmel's SAMA5D2 family SoC.
@@@ -125,6 -126,9 +126,9 @@@ config HAVE_AT91_H32M
  config HAVE_AT91_GENERATED_CLK
        bool
  
+ config HAVE_AT91_AUDIO_PLL
+       bool
+ 
  config SOC_SAM_V4_V5
        bool
  

diff --combined drivers/clk/sunxi-ng/Makefile
index 45a5910379a519d245d8c84c92a42ce198de4006,1fd8fe9c1e3e20556d5e312086d658ce88d6d0e0..85a0633c1eac2554cfddca0b202eb5f81cc9c826
--- 1/drivers/clk/sunxi-ng/Makefile
--- 2/drivers/clk/sunxi-ng/Makefile
+++ b/drivers/clk/sunxi-ng/Makefile
@@@ -1,6 -1,5 +1,6 @@@
  # Common objects
  lib-$(CONFIG_SUNXI_CCU)               += ccu_common.o
 +lib-$(CONFIG_SUNXI_CCU)               += ccu_mmc_timing.o
  lib-$(CONFIG_SUNXI_CCU)               += ccu_reset.o
  
  # Base clock types
@@@ -20,6 -19,7 +20,7 @@@ lib-$(CONFIG_SUNXI_CCU)               += ccu_mp.
  
  # SoC support
  obj-$(CONFIG_SUN50I_A64_CCU)  += ccu-sun50i-a64.o
+ obj-$(CONFIG_SUN4I_A10_CCU)   += ccu-sun4i-a10.o
  obj-$(CONFIG_SUN5I_CCU)               += ccu-sun5i.o
  obj-$(CONFIG_SUN6I_A31_CCU)   += ccu-sun6i-a31.o
  obj-$(CONFIG_SUN8I_A23_CCU)   += ccu-sun8i-a23.o
@@@ -29,6 -29,7 +30,7 @@@ obj-$(CONFIG_SUN8I_H3_CCU)    += ccu-sun8i
  obj-$(CONFIG_SUN8I_V3S_CCU)   += ccu-sun8i-v3s.o
  obj-$(CONFIG_SUN8I_DE2_CCU)   += ccu-sun8i-de2.o
  obj-$(CONFIG_SUN8I_R_CCU)     += ccu-sun8i-r.o
+ obj-$(CONFIG_SUN8I_R40_CCU)   += ccu-sun8i-r40.o
  obj-$(CONFIG_SUN9I_A80_CCU)   += ccu-sun9i-a80.o
  obj-$(CONFIG_SUN9I_A80_CCU)   += ccu-sun9i-a80-de.o
  obj-$(CONFIG_SUN9I_A80_CCU)   += ccu-sun9i-a80-usb.o

diff --combined sound/soc/atmel/atmel-classd.c
index 0cd7caaed9c410e6d148a54477210525470c7a48,be6b775b6f46a75ece4b8e1d95891a5dc77a49fa..8445edd067375d5349b0bba3bc5529c74f15d35c
--- 1/sound/soc/atmel/atmel-classd.c
--- 2/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@@ -32,7 -32,6 +32,6 @@@ struct atmel_classd 
        struct regmap *regmap;
        struct clk *pclk;
        struct clk *gclk;
-       struct clk *aclk;
        int irq;
        const struct atmel_classd_pdata *pdata;
  };
@@@ -330,11 -329,6 +329,6 @@@ static int atmel_classd_codec_dai_start
  {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
-       int ret;
- 
-       ret = clk_prepare_enable(dd->aclk);
-       if (ret)
-               return ret;
  
        return clk_prepare_enable(dd->gclk);
  }
@@@ -357,31 -351,31 +351,31 @@@ static int atmel_classd_codec_dai_digit
        return 0;
  }
  
- #define CLASSD_ACLK_RATE_11M2896_MPY_8 (112896 * 100 * 8)
- #define CLASSD_ACLK_RATE_12M288_MPY_8  (12288 * 1000 * 8)
+ #define CLASSD_GCLK_RATE_11M2896_MPY_8 (112896 * 100 * 8)
+ #define CLASSD_GCLK_RATE_12M288_MPY_8  (12288 * 1000 * 8)
  
  static struct {
        int rate;
        int sample_rate;
        int dsp_clk;
-       unsigned long aclk_rate;
+       unsigned long gclk_rate;
  } const sample_rates[] = {
        { 8000,  CLASSD_INTPMR_FRAME_8K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
        { 16000, CLASSD_INTPMR_FRAME_16K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
        { 32000, CLASSD_INTPMR_FRAME_32K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
        { 48000, CLASSD_INTPMR_FRAME_48K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
        { 96000, CLASSD_INTPMR_FRAME_96K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_ACLK_RATE_12M288_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_12M288, CLASSD_GCLK_RATE_12M288_MPY_8 },
        { 22050, CLASSD_INTPMR_FRAME_22K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_ACLK_RATE_11M2896_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_GCLK_RATE_11M2896_MPY_8 },
        { 44100, CLASSD_INTPMR_FRAME_44K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_ACLK_RATE_11M2896_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_GCLK_RATE_11M2896_MPY_8 },
        { 88200, CLASSD_INTPMR_FRAME_88K,
-       CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_ACLK_RATE_11M2896_MPY_8 },
+       CLASSD_INTPMR_DSP_CLK_FREQ_11M2896, CLASSD_GCLK_RATE_11M2896_MPY_8 },
  };
  
  static int
@@@ -410,13 -404,12 +404,12 @@@ atmel_classd_codec_dai_hw_params(struc
        }
  
        dev_dbg(codec->dev,
-               "Selected SAMPLE_RATE of %dHz, ACLK_RATE of %ldHz\n",
-               sample_rates[best].rate, sample_rates[best].aclk_rate);
+               "Selected SAMPLE_RATE of %dHz, GCLK_RATE of %ldHz\n",
+               sample_rates[best].rate, sample_rates[best].gclk_rate);
  
        clk_disable_unprepare(dd->gclk);
-       clk_disable_unprepare(dd->aclk);
  
-       ret = clk_set_rate(dd->aclk, sample_rates[best].aclk_rate);
+       ret = clk_set_rate(dd->gclk, sample_rates[best].gclk_rate);
        if (ret)
                return ret;
  
@@@ -426,10 -419,6 +419,6 @@@
  
        snd_soc_update_bits(codec, CLASSD_INTPMR, mask, val);
  
-       ret = clk_prepare_enable(dd->aclk);
-       if (ret)
-               return ret;
- 
        return clk_prepare_enable(dd->gclk);
  }
  
@@@ -441,7 -430,6 +430,6 @@@ atmel_classd_codec_dai_shutdown(struct 
        struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
  
        clk_disable_unprepare(dd->gclk);
-       clk_disable_unprepare(dd->aclk);
  }
  
  static int atmel_classd_codec_dai_prepare(struct snd_pcm_substream *substream,
@@@ -596,13 -584,6 +584,6 @@@ static int atmel_classd_probe(struct pl
                return ret;
        }
  
-       dd->aclk = devm_clk_get(dev, "aclk");
-       if (IS_ERR(dd->aclk)) {
-               ret = PTR_ERR(dd->aclk);
-               dev_err(dev, "failed to get audio clock: %d\n", ret);
-               return ret;
-       }
- 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        io_base = devm_ioremap_resource(dev, res);
        if (IS_ERR(io_base)) {
@@@ -652,6 -633,7 +633,6 @@@
        }
  
        snd_soc_card_set_drvdata(card, dd);
 -      platform_set_drvdata(pdev, card);
  
        ret = atmel_classd_asoc_card_init(dev, card);
        if (ret) {