]> Git Repo - linux.git/commitdiff
Merge tag 'nand/for-4.14' of git://git.infradead.org/l2-mtd into mtd/next
authorBoris Brezillon <[email protected]>
Fri, 1 Sep 2017 13:34:30 +0000 (15:34 +0200)
committerBoris Brezillon <[email protected]>
Fri, 1 Sep 2017 13:34:30 +0000 (15:34 +0200)
From Boris:
"
This pull request contains the following core changes:

* Fix memory leaks in the core
* Remove unused NAND locking support
* Rename nand.h into rawnand.h (preparing support for spi NANDs)
* Use NAND_MAX_ID_LEN where appropriate
* Fix support for 20nm Hynix chips
* Fix support for Samsung and Hynix SLC NANDs

and the following driver changes:

* Various cleanup, improvements and fixes in the qcom driver
* Fixes for bugs detected by various static code analysis tools
* Fix mxc ooblayout definition
* Add a new part_parsers to tmio and sharpsl platform data in order to
  define a custom list of partition parsers
* Request the reset line in exclusive mode in the sunxi driver
* Fix a build error in the orion-nand driver when compiled for ARMv4
* Allow 64-bit mvebu platforms to select the PXA3XX driver
"

1  2 
MAINTAINERS
arch/arm/mach-davinci/board-da850-evm.c
drivers/mtd/nand/atmel/nand-controller.c
drivers/mtd/nand/atmel/pmecc.c
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/nand_timings.c
drivers/mtd/nand/nandsim.c
drivers/mtd/nand/sunxi_nand.c
include/linux/mtd/rawnand.h

diff --combined MAINTAINERS
index 1c3feffb1c1cfd2b46685907300a9f026fb67e6a,bffb38373550d8a9b2daf64d2e01d30e33cbebc2..1c0cc17f48547151171b31d312ab6876de695956
@@@ -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 <[email protected]>
  L:    [email protected]
@@@ -491,6 -492,13 +491,6 @@@ S:        Maintaine
  F:    Documentation/hwmon/adt7475
  F:    drivers/hwmon/adt7475.c
  
 -ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
 -M:    Michael Hennerich <[email protected]>
 -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 <[email protected]>
  M:    Hannes Reinecke <[email protected]>
@@@ -499,13 -507,6 +499,13 @@@ S:       Maintaine
  F:    Documentation/scsi/advansys.txt
  F:    drivers/scsi/advansys.c
  
 +ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
 +M:    Michael Hennerich <[email protected]>
 +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 <[email protected]>
  S:    Maintained
@@@ -807,12 -808,6 +807,12 @@@ W:       http://blackfin.uclinux.org
  S:    Supported
  F:    sound/soc/blackfin/*
  
 +ANALOG DEVICES INC DMA DRIVERS
 +M:    Lars-Peter Clausen <[email protected]>
 +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 <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -825,6 -820,12 +825,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 <[email protected]>
 -W:    http://ez.analog.com/community/linux-device-drivers
 -S:    Supported
 -F:    drivers/dma/dma-axi-dmac.c
 -
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <[email protected]>
  S:    Supported
@@@ -871,15 -872,6 +871,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 <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  L:    [email protected]
@@@ -903,18 -895,6 +903,18 @@@ M:       Duc Dang <[email protected]
  S:    Supported
  F:    arch/arm64/boot/dts/apm/
  
 +APPLIED MICRO (APM) X-GENE SOC EDAC
 +M:    Loc Ho <[email protected]>
 +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 <[email protected]>
 +M:    Keyur Chudgar <[email protected]>
 +S:    Supported
 +F:    drivers/net/ethernet/apm/xgene-v2/
 +
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
  M:    Iyappan Subramanian <[email protected]>
  M:    Keyur Chudgar <[email protected]>
@@@ -925,6 -905,12 +925,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 <[email protected]>
 -M:    Keyur Chudgar <[email protected]>
 -S:    Supported
 -F:    drivers/net/ethernet/apm/xgene-v2/
 -
  APPLIED MICRO (APM) X-GENE SOC PMU
  M:    Tai Nguyen <[email protected]>
  S:    Supported
@@@ -944,12 -930,6 +944,12 @@@ S:       Maintaine
  F:    drivers/video/fbdev/arcfb.c
  F:    drivers/video/fbdev/core/fb_defio.c
  
 +ARC PGU DRM DRIVER
 +M:    Alexey Brodkin <[email protected]>
 +S:    Supported
 +F:    drivers/gpu/drm/arc/
 +F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
 +
  ARCNET NETWORK LAYER
  M:    Michael Grzeschik <[email protected]>
  L:    [email protected]
@@@ -957,6 -937,12 +957,6 @@@ S:        Maintaine
  F:    drivers/net/arcnet/
  F:    include/uapi/linux/if_arcnet.h
  
 -ARC PGU DRM DRIVER
 -M:    Alexey Brodkin <[email protected]>
 -S:    Supported
 -F:    drivers/gpu/drm/arc/
 -F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
 -
  ARM ARCHITECTED TIMER DRIVER
  M:    Mark Rutland <[email protected]>
  M:    Marc Zyngier <[email protected]>
@@@ -1009,17 -995,18 +1009,17 @@@ S:    Maintaine
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git
  F:    arch/arm/
  
 -ARM SUB-ARCHITECTURES
 -L:    [email protected] (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 <[email protected]>
  S:    Maintained
  F:    sound/arm/aaci.*
  
 +ARM PRIMECELL BUS SUPPORT
 +M:    Russell King <[email protected]>
 +S:    Maintained
 +F:    drivers/amba/
 +F:    include/linux/amba/bus.h
 +
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <[email protected]>
  S:    Maintained
@@@ -1043,22 -1030,11 +1043,22 @@@ S:   Maintaine
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
 -ARM PRIMECELL BUS SUPPORT
 -M:    Russell King <[email protected]>
 +ARM SMMU DRIVERS
 +M:    Will Deacon <[email protected]>
 +R:    Robin Murphy <[email protected]>
 +L:    [email protected] (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:    [email protected] (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 <[email protected]>
@@@ -1091,11 -1067,6 +1091,11 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/Allwinner SoC Clock Support
 +M:    Emilio López <[email protected]>
 +S:    Maintained
 +F:    drivers/clk/sunxi/
 +
  ARM/Allwinner sunXi SoC support
  M:    Maxime Ripard <[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
@@@ -1110,15 -1081,10 +1110,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 <[email protected]>
 +ARM/Amlogic Meson SoC CLOCK FRAMEWORK
 +M:    Neil Armstrong <[email protected]>
 +M:    Jerome Brunet <[email protected]>
 +L:    [email protected]
  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 <[email protected]>
@@@ -1130,10 -1096,20 +1130,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 <[email protected]>
 -M:    Jerome Brunet <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  M:    Antoine Tenart <[email protected]>
@@@ -1156,30 -1132,25 +1156,30 @@@ F:   drivers/clk/axi
  F:    drivers/pinctrl/pinctrl-artpec*
  F:    Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
  
 -ARM/ASPEED MACHINE SUPPORT
 -M:    Joel Stanley <[email protected]>
 -S:    Maintained
 -F:    arch/arm/mach-aspeed/
 -F:    arch/arm/boot/dts/aspeed-*
 -F:    drivers/*/*aspeed*
 -
  ARM/ASPEED I2C DRIVER
  M:    Brendan Higgins <[email protected]>
  R:    Benjamin Herrenschmidt <[email protected]>
  R:    Joel Stanley <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected] (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 <[email protected]>
 +S:    Maintained
 +F:    arch/arm/mach-aspeed/
 +F:    arch/arm/boot/dts/aspeed-*
 +F:    drivers/*/*aspeed*
 +
 +ARM/ATMEL AT91 Clock Support
 +M:    Boris Brezillon <[email protected]>
 +S:    Maintained
 +F:    drivers/clk/at91
 +
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
@@@ -1196,6 -1167,11 +1196,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 <[email protected]>
 -S:    Maintained
 -F:    drivers/clk/at91
 -
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Odd Fixes
  N:    clps711x
  
 +ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 +M:    Lennert Buytenhek <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <[email protected]>
  M:    Alexander Sverdlin <[email protected]>
@@@ -1235,6 -1206,11 +1235,6 @@@ S:     Maintaine
  F:    arch/arm/mach-ep93xx/
  F:    arch/arm/mach-ep93xx/include/mach/
  
 -ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/CLKDEV SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1248,13 -1224,6 +1248,13 @@@ M:    Mike Rapoport <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
 +M:    Baruch Siach <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/boot/dts/cx92755*
 +N:    digicolor
 +
  ARM/CONTEC MICRO9 MACHINE SUPPORT
  M:    Hubert Feurstein <[email protected]>
  S:    Maintained
@@@ -1300,6 -1269,13 +1300,6 @@@ F:     drivers/clocksource/timer-prima2.
  F:    drivers/clocksource/timer-atlas7.c
  N:    [^a-z]sirf
  
 -ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
 -M:    Baruch Siach <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/boot/dts/cx92755*
 -N:    digicolor
 -
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-pxa/colibri-pxa270-income.c
  
 +ARM/INTEL IOP13XX ARM ARCHITECTURE
 +M:    Lennert Buytenhek <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1427,6 -1398,11 +1427,6 @@@ ARM/INTEL IOP33X ARM ARCHITECTUR
  L:    [email protected] (moderated for non-subscribers)
  S:    Orphan
  
 -ARM/INTEL IOP13XX ARM ARCHITECTURE
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1461,6 -1437,39 +1461,6 @@@ M:     Lennert Buytenhek <kernel@wantstofly
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 -M:    Santosh Shilimkar <[email protected]>
 -L:    [email protected] (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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/clk/keystone/
 -
 -ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 -M:    Santosh Shilimkar <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/clocksource/timer-keystone.c
 -
 -ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
 -M:    Santosh Shilimkar <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/power/reset/keystone-reset.c
 -
 -ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 -M:    Santosh Shilimkar <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/memory/*emif*
 -
  ARM/LG1K ARCHITECTURE
  M:    Chanho Min <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1503,6 -1512,24 +1503,6 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <[email protected]>
  S:    Maintained
  
 -ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
 -M:    Jason Cooper <[email protected]>
 -M:    Andrew Lunn <[email protected]>
 -M:    Gregory Clement <[email protected]>
 -M:    Sebastian Hesselbarth <[email protected]>
 -L:    [email protected] (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 <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -1512,6 -1539,7 +1512,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 <[email protected]>
  M:    Andrew Lunn <[email protected]>
@@@ -1527,26 -1555,27 +1527,26 @@@ 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 <[email protected]>
 +ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
 +M:    Jason Cooper <[email protected]>
 +M:    Andrew Lunn <[email protected]>
 +M:    Gregory Clement <[email protected]>
 +M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.digriz.org.uk/ts78xx/kernel
  S:    Maintained
 -F:    arch/arm/mach-orion5x/ts78xx-*
 +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/OXNAS platform support
 -M:    Neil Armstrong <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (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/Mediatek RTC DRIVER
 -M:    Eddie Huang <[email protected]>
 +ARM/Mediatek RTC DRIVER
 +M:    Eddie Huang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1598,53 -1627,16 +1598,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 <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  L:    [email protected] (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
  S:    Supported
  
 -ARM/TOSA MACHINE SUPPORT
 -M:    Dmitry Eremin-Solenikov <[email protected]>
 -M:    Dirk Opfer <[email protected]>
 +ARM/Orion SoC/Technologic Systems TS-78xx platform support
 +M:    Alexander Clouter <[email protected]>
 +L:    [email protected] (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 <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -1662,6 -1654,14 +1662,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 <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/platform/s5p-g2d/
  
 -ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 -M:    Kyungmin Park <[email protected]>
 -M:    Kamil Debski <[email protected]>
 -M:    Jeongtae Park <[email protected]>
 -M:    Andrzej Hajda <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/media/platform/s5p-jpeg/
  
 +ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 +M:    Kyungmin Park <[email protected]>
 +M:    Kamil Debski <[email protected]>
 +M:    Jeongtae Park <[email protected]>
 +M:    Andrzej Hajda <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/plat-samsung/s5p-dev-mfc.c
 +F:    drivers/media/platform/s5p-mfc/
 +
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Simon Horman <[email protected]>
  M:    Magnus Damm <[email protected]>
@@@ -1922,48 -1922,26 +1922,48 @@@ M:   "Mark F. Brown" <mark.brown314@gmail
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/memory/*emif*
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected] (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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clk/keystone/
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clocksource/timer-keystone.c
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/power/reset/keystone-reset.c
 +
  ARM/THECUS N2100 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/NUVOTON W90X900 ARM ARCHITECTURE
 -M:    Wan ZongShun <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.mcuos.com
 +ARM/TOSA MACHINE SUPPORT
 +M:    Dmitry Eremin-Solenikov <[email protected]>
 +M:    Dirk Opfer <[email protected]>
  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 <[email protected]>
@@@ -2108,6 -2086,16 +2108,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 <[email protected]>
 -R:    Robin Murphy <[email protected]>
 -L:    [email protected] (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 <[email protected]>
  M:    Will Deacon <[email protected]>
@@@ -2219,10 -2207,21 +2219,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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/users/Drivers/carl9170
 +ATI_REMOTE2 DRIVER
 +M:    Ville Syrjala <[email protected]>
  S:    Maintained
 -F:    drivers/net/wireless/ath/carl9170/
 +F:    drivers/input/misc/ati_remote2.c
  
  ATK0110 HWMON DRIVER
  M:    Luca Tettamanti <[email protected]>
  S:    Maintained
  F:    drivers/hwmon/asus_atk0110.c
  
 -ATI_REMOTE2 DRIVER
 -M:    Ville Syrjala <[email protected]>
 -S:    Maintained
 -F:    drivers/input/misc/ati_remote2.c
 -
  ATLX ETHERNET DRIVERS
  M:    Jay Cliburn <[email protected]>
  M:    Chris Snook <[email protected]>
@@@ -2259,12 -2263,25 +2259,12 @@@ M:   Nicolas Ferre <nicolas.ferre@microch
  S:    Supported
  F:    drivers/power/reset/at91-sama5d2_shdwc.c
  
 -ATMEL SAMA5D2 ADC DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/iio/adc/at91-sama5d2_adc.c
 -
  ATMEL Audio ALSA driver
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/atmel
  
 -ATMEL XDMA DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/dma/at_xdmac.c
 -
  ATMEL I2C DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected]
@@@ -2290,14 -2307,6 +2290,14 @@@ M:    Nicolas Ferre <nicolas.ferre@microch
  S:    Supported
  F:    drivers/net/ethernet/cadence/
  
 +ATMEL MAXTOUCH DRIVER
 +M:    Nick Dyer <[email protected]>
 +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 <[email protected]>
  M:    Josh Wu <[email protected]>
  S:    Supported
  F:    drivers/mtd/nand/atmel/*
  
 +ATMEL SAMA5D2 ADC DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/adc/at91-sama5d2_adc.c
 +
  ATMEL SDMMC DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected]
@@@ -2350,12 -2353,13 +2350,12 @@@ W:   http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel/atmel*
  
 -ATMEL MAXTOUCH DRIVER
 -M:    Nick Dyer <[email protected]>
 -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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/dma/at_xdmac.c
  
  ATOMIC INFRASTRUCTURE
  M:    Will Deacon <[email protected]>
@@@ -2409,6 -2413,13 +2409,6 @@@ F:     include/uapi/linux/ax25.
  F:    include/net/ax25.h
  F:    net/ax25/
  
 -AXENTIA ASOC DRIVERS
 -M:    Peter Rosin <[email protected]>
 -L:    [email protected] (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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2417,13 -2428,6 +2417,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 <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -2503,11 -2507,13 +2503,11 @@@ W:   https://linuxtv.or
  S:    Supported
  F:    drivers/media/platform/sti/bdisp
  
 -DELTA ST MEDIA DRIVER
 -M:    Hugues Fruchet <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/ec_bhf.c
  
  BEFS FILE SYSTEM
  M:    Luis de Bethencourt <[email protected]>
@@@ -2517,13 -2523,11 +2517,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 <[email protected]>
 -L:    [email protected]
 +BFQ I/O SCHEDULER
 +M:    Paolo Valente <[email protected]>
 +M:    Jens Axboe <[email protected]>
 +L:    [email protected]
  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" <[email protected]>
@@@ -2546,47 -2550,47 +2546,47 @@@ W:   http://blackfin.uclinux.or
  S:    Supported
  F:    drivers/net/ethernet/adi/
  
 -BLACKFIN RTC DRIVER
 +BLACKFIN I2C TWI DRIVER
 +M:    Sonic Zhang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 +W:    http://blackfin.uclinux.org/
  S:    Supported
 -F:    drivers/rtc/rtc-bfin.c
 +F:    drivers/i2c/busses/i2c-bfin-twi.c
  
 -BLACKFIN SDH DRIVER
 -M:    Sonic Zhang <sonic.zhang@analog.com>
 +BLACKFIN MEDIA DRIVER
 +M:    Scott Jiang <scott.jiang.linux@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 +W:    http://blackfin.uclinux.org/
  S:    Supported
 -F:    drivers/mmc/host/bfin_sdh.c
 -
 -BLACKFIN SERIAL DRIVER
 -M:    Sonic Zhang <[email protected]>
 +F:    drivers/media/platform/blackfin/
 +F:    drivers/media/i2c/adv7183*
 +F:    drivers/media/i2c/vs6624*
 +
 +BLACKFIN RTC DRIVER
  L:    [email protected] (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
 -F:    drivers/tty/serial/bfin_uart.c
 +F:    drivers/rtc/rtc-bfin.c
  
 -BLACKFIN WATCHDOG DRIVER
 +BLACKFIN SDH DRIVER
 +M:    Sonic Zhang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
 -F:    drivers/watchdog/bfin_wdt.c
 +F:    drivers/mmc/host/bfin_sdh.c
  
 -BLACKFIN I2C TWI DRIVER
 +BLACKFIN SERIAL DRIVER
  M:    Sonic Zhang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 +W:    http://blackfin.uclinux.org
  S:    Supported
 -F:    drivers/i2c/busses/i2c-bfin-twi.c
 +F:    drivers/tty/serial/bfin_uart.c
  
 -BLACKFIN MEDIA DRIVER
 -M:    Scott Jiang <[email protected]>
 +BLACKFIN WATCHDOG DRIVER
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 +W:    http://blackfin.uclinux.org
  S:    Supported
 -F:    drivers/media/platform/blackfin/
 -F:    drivers/media/i2c/adv7183*
 -F:    drivers/media/i2c/vs6624*
 +F:    drivers/watchdog/bfin_wdt.c
  
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <[email protected]>
@@@ -2602,6 -2606,14 +2602,6 @@@ F:     block
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
 -BFQ I/O SCHEDULER
 -M:    Paolo Valente <[email protected]>
 -M:    Jens Axboe <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    block/bfq-*
 -F:    Documentation/block/bfq-iosched.txt
 -
  BLOCK2MTD DRIVER
  M:    Joern Engel <[email protected]>
  L:    [email protected]
@@@ -2631,6 -2643,21 +2631,6 @@@ S:     Maintaine
  F:    net/bluetooth/
  F:    include/net/bluetooth/
  
 -DMA MAPPING HELPERS
 -M:    Christoph Hellwig <[email protected]>
 -M:    Marek Szyprowski <[email protected]>
 -R:    Robin Murphy <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  M:    Veaceslav Falico <[email protected]>
@@@ -2678,6 -2705,35 +2678,6 @@@ S:     Supporte
  F:    drivers/net/dsa/b53/*
  F:    include/linux/platform_data/b53.h
  
 -BROADCOM GENET ETHERNET DRIVER
 -M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/net/ethernet/broadcom/genet/
 -
 -BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <[email protected]>
 -M:    Harish Patil <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/net/ethernet/broadcom/bnx2.*
 -F:    drivers/net/ethernet/broadcom/bnx2_*
 -
 -BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 -M:    Yuval Mintz <[email protected]>
 -M:    Ariel Elior <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/net/ethernet/broadcom/bnx2x/
 -
 -BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER
 -M:    Michael Chan <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/net/ethernet/broadcom/bnxt/
 -
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
  M:    Ray Jui <[email protected]>
@@@ -2756,13 -2812,6 +2756,13 @@@ F:    arch/arm/boot/dts/bcm7*.dts
  F:    drivers/bus/brcmstb_gisb.c
  N:    brcmstb
  
 +BROADCOM BMIPS CPUFREQ DRIVER
 +M:    Markus Mayer <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/cpufreq/bmips-cpufreq.c
 +
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Kevin Cernekee <[email protected]>
  M:    Florian Fainelli <[email protected]>
@@@ -2779,40 -2828,20 +2779,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 <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/cpufreq/bmips-cpufreq.c
 +BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 +M:    Rasesh Mody <[email protected]>
 +M:    Harish Patil <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/broadcom/bnx2.*
 +F:    drivers/net/ethernet/broadcom/bnx2_*
  
 -BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Siva Reddy Kallam <[email protected]>
 -M:    Prashant Sreedharan <[email protected]>
 -M:    Michael Chan <[email protected]>
 +BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/bnx2fc/
 +
 +BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/bnx2i/
 +
 +BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 +M:    Yuval Mintz <[email protected]>
 +M:    Ariel Elior <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/ethernet/broadcom/tg3.*
 +F:    drivers/net/ethernet/broadcom/bnx2x/
 +
 +BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER
 +M:    Michael Chan <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/broadcom/bnxt/
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Arend van Spriel <[email protected]>
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
 -BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 -M:    [email protected]
 -L:    [email protected]
 +BROADCOM BRCMSTB GPIO DRIVER
 +M:    Gregory Fong <[email protected]>
 +L:    [email protected]
  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:    [email protected]
 -L:    linux-scsi@vger.kernel.org
 +BROADCOM GENET ETHERNET DRIVER
 +M:    Florian Fainelli <[email protected]>
 +L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/scsi/bnx2i/
 +F:    drivers/net/ethernet/broadcom/genet/
  
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
@@@ -2864,6 -2892,13 +2864,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 <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/gpio/gpio-brcmstb.c
 -F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 -
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <[email protected]>
  L:    [email protected]
@@@ -2871,29 -2906,19 +2871,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 <[email protected]>
 +M:    Devesh Sharma <[email protected]>
 +M:    Somnath Kotur <[email protected]>
 +M:    Sriharsha Basavapatna <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
 -BROADCOM STB NAND FLASH DRIVER
 -M:    Brian Norris <[email protected]>
 -M:    Kamal Dasu <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 +BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 +M:    Rafał Miłecki <[email protected]>
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/nand/brcmnand/
 +F:    drivers/bcma/
 +F:    include/linux/bcma/
  
  BROADCOM STB AVS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
@@@ -2903,13 -2928,12 +2903,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 <[email protected]>
 -L:    [email protected]
 +BROADCOM STB NAND FLASH DRIVER
 +M:    Brian Norris <[email protected]>
 +M:    Kamal Dasu <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/bcma/
 -F:    include/linux/bcma/
 +F:    drivers/mtd/nand/brcmnand/
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <[email protected]>
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  
 -BROADCOM NETXTREME-E ROCE DRIVER
 -M:    Selvin Xavier <[email protected]>
 -M:    Devesh Sharma <[email protected]>
 -M:    Somnath Kotur <[email protected]>
 -M:    Sriharsha Basavapatna <[email protected]>
 -L:    [email protected]
 -W:    http://www.broadcom.com
 +BROADCOM TG3 GIGABIT ETHERNET DRIVER
 +M:    Siva Reddy Kallam <[email protected]>
 +M:    Prashant Sreedharan <[email protected]>
 +M:    Michael Chan <[email protected]>
 +L:    [email protected]
  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 <[email protected]>
@@@ -2986,15 -3013,6 +2986,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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -3069,21 -3087,6 +3069,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 <[email protected]>
 +M:    Marc Kleine-Budde <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Marc Kleine-Budde <[email protected]>
@@@ -3100,6 -3103,21 +3100,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 <[email protected]>
 -M:    Marc Kleine-Budde <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -3114,12 -3132,12 +3114,12 @@@ M:   Kevin Tsai <[email protected]
  S:    Maintained
  F:    drivers/iio/light/cm*
  
 -CAVIUM THUNDERX2 ARM64 SOC
 -M:    Jayachandran C <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 +M:    Christian Lamparter <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -3129,16 -3147,6 +3129,16 @@@ S:    Supporte
  F:    drivers/i2c/busses/i2c-octeon*
  F:    drivers/i2c/busses/i2c-thunderx*
  
 +CAVIUM LIQUIDIO NETWORK DRIVER
 +M:    Derek Chickles <[email protected]>
 +M:    Satanand Burla <[email protected]>
 +M:    Felix Manlunas <[email protected]>
 +M:    Raghu Vatsavayi <[email protected]>
 +L:    [email protected]
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/net/ethernet/cavium/liquidio/
 +
  CAVIUM MMC DRIVER
  M:    Jan Glauber <[email protected]>
  M:    David Daney <[email protected]>
@@@ -3147,6 -3155,16 +3147,6 @@@ W:     http://www.cavium.co
  S:    Supported
  F:    drivers/mmc/host/cavium*
  
 -CAVIUM LIQUIDIO NETWORK DRIVER
 -M:     Derek Chickles <[email protected]>
 -M:     Satanand Burla <[email protected]>
 -M:     Felix Manlunas <[email protected]>
 -M:     Raghu Vatsavayi <[email protected]>
 -L:     [email protected]
 -W:     http://www.cavium.com
 -S:     Supported
 -F:     drivers/net/ethernet/cavium/liquidio/
 -
  CAVIUM OCTEON-TX CRYPTO DRIVER
  M:    George Cherian <[email protected]>
  L:    [email protected]
@@@ -3154,13 -3172,6 +3154,13 @@@ W:    http://www.cavium.co
  S:    Supported
  F:    drivers/crypto/cavium/cpt/
  
 +CAVIUM THUNDERX2 ARM64 SOC
 +M:    Jayachandran C <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  L:    [email protected]
@@@ -3249,6 -3260,12 +3249,6 @@@ F:     drivers/usb/host/whci
  F:    drivers/usb/wusbcore/
  F:    include/linux/usb/wusb*
  
 -HT16K33 LED CONTROLLER DRIVER
 -M:    Robin van der Gracht <[email protected]>
 -S:    Maintained
 -F:    drivers/auxdisplay/ht16k33.c
 -F:    Documentation/devicetree/bindings/display/ht16k33.txt
 -
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <[email protected]>
  W:    http://miguelojeda.es/auxdisplay.htm
@@@ -3320,34 -3337,6 +3320,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 <[email protected]>
 +M:    Paul Handrigan <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/codecs/cs*
 +
 +CIRRUS LOGIC EP93XX ETHERNET DRIVER
 +M:    Hartley Sweeten <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
 +
 +CISCO FCOE HBA DRIVER
 +M:    Satish Kharat <[email protected]>
 +M:    Sesidhar Baddela <[email protected]>
 +M:    Karan Tilak Kumar <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/fnic/
 +
 +CISCO SCSI HBA DRIVER
 +M:    Karan Tilak Kumar <[email protected]>
 +M:    Sesidhar Baddela <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/snic/
 +
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
  M:    Govindarajulu Varadarajan <[email protected]>
@@@ -3361,6 -3350,19 +3361,6 @@@ M:     Dave Goodell <[email protected]
  S:    Supported
  F:    drivers/infiniband/hw/usnic/
  
 -CIRRUS LOGIC EP93XX ETHERNET DRIVER
 -M:    Hartley Sweeten <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
 -
 -CIRRUS LOGIC AUDIO CODEC DRIVERS
 -M:    Brian Austin <[email protected]>
 -M:    Paul Handrigan <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    sound/soc/codecs/cs*
 -
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected]
@@@ -3382,6 -3384,21 +3382,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/clocksource
  
 -CISCO FCOE HBA DRIVER
 -M:    Satish Kharat <[email protected]>
 -M:    Sesidhar Baddela <[email protected]>
 -M:    Karan Tilak Kumar <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/scsi/fnic/
 -
 -CISCO SCSI HBA DRIVER
 -M:    Karan Tilak Kumar <[email protected]>
 -M:    Sesidhar Baddela <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/scsi/snic/
 -
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  M:    Daniel Oliveira Nascimento <[email protected]>
  S:    Maintained
  F:    drivers/pci/hotplug/cpci_hotplug*
  
 -COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
 +COMPACTPCI HOTPLUG GENERIC DRIVER
  M:    Scott Murray <[email protected]>
  L:    [email protected]
  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 <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/pci/hotplug/cpcihp_generic.c
 +F:    drivers/pci/hotplug/cpcihp_zt5550.*
  
  COMPAL LAPTOP SUPPORT
  M:    Cezary Jackiewicz <[email protected]>
@@@ -3570,18 -3587,6 +3570,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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    tools/power/cpupower/
 +
 +CPUID/MSR DRIVER
 +M:    "H. Peter Anvin" <[email protected]>
 +S:    Maintained
 +F:    arch/x86/kernel/cpuid.c
 +F:    arch/x86/kernel/msr.c
 +
  CPUIDLE DRIVER - ARM BIG LITTLE
  M:    Lorenzo Pieralisi <[email protected]>
  M:    Daniel Lezcano <[email protected]>
@@@ -3611,6 -3616,18 +3611,6 @@@ B:     https://bugzilla.kernel.or
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
 -CPUID/MSR DRIVER
 -M:    "H. Peter Anvin" <[email protected]>
 -S:    Maintained
 -F:    arch/x86/kernel/cpuid.c
 -F:    arch/x86/kernel/msr.c
 -
 -CPU POWER MONITORING SUBSYSTEM
 -M:    Thomas Renninger <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    tools/power/cpupower/
 -
  CRAMFS FILESYSTEM
  W:    http://sourceforge.net/projects/cramfs/
  S:    Orphan / Obsolete
@@@ -3740,13 -3757,6 +3740,13 @@@ S:    Supporte
  F:    drivers/infiniband/hw/cxgb3/
  F:    include/uapi/rdma/cxgb3-abi.h
  
 +CXGB4 CRYPTO DRIVER (chcr)
 +M:    Harsh Jain <[email protected]>
 +L:    [email protected]
 +W:    http://www.chelsio.com
 +S:    Supported
 +F:    drivers/crypto/chelsio
 +
  CXGB4 ETHERNET DRIVER (CXGB4)
  M:    Ganesh Goudar <[email protected]>
  L:    [email protected]
@@@ -3769,6 -3779,13 +3769,6 @@@ S:     Supporte
  F:    drivers/infiniband/hw/cxgb4/
  F:    include/uapi/rdma/cxgb4-abi.h
  
 -CXGB4 CRYPTO DRIVER (chcr)
 -M:    Harsh Jain <[email protected]>
 -L:    [email protected]
 -W:    http://www.chelsio.com
 -S:    Supported
 -F:    drivers/crypto/chelsio
 -
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
  M:    Casey Leedom <[email protected]>
  L:    [email protected]
@@@ -3798,6 -3815,14 +3798,6 @@@ F:     drivers/scsi/cxlflash
  F:    include/uapi/scsi/cxlflash_ioctls.h
  F:    Documentation/powerpc/cxlflash.txt
  
 -STMMAC ETHERNET DRIVER
 -M:    Giuseppe Cavallaro <[email protected]>
 -M:    Alexandre Torgue <[email protected]>
 -L:    [email protected]
 -W:    http://www.stlinux.com
 -S:    Supported
 -F:    drivers/net/ethernet/stmicro/stmmac/
 -
  CYBERPRO FB DRIVER
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/platform/x86/dell-laptop.c
  
 -DELL LAPTOP RBTN DRIVER
 +DELL LAPTOP FREEFALL DRIVER
  M:    Pali Rohár <[email protected]>
  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 <[email protected]>
  S:    Maintained
 -F:    drivers/platform/x86/dell-smo8800.c
 +F:    drivers/platform/x86/dell-rbtn.*
  
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <[email protected]>
@@@ -3949,14 -3974,6 +3949,14 @@@ M:    Pali Rohár <[email protected]
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 +DELTA ST MEDIA DRIVER
 +M:    Hugues Fruchet <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -4011,6 -4028,15 +4011,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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
  W:    http://lanana.org/docs/device-list/index.html
@@@ -4160,6 -4186,20 +4160,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 <[email protected]>
 -R:    Gustavo Padovan <[email protected]>
 -S:    Maintained
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -4171,21 -4211,6 +4171,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 <[email protected]>
 +M:    Marek Szyprowski <[email protected]>
 +R:    Robin Murphy <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -4216,13 -4241,6 +4216,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 <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/dw9714.c
 +
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
  L:    [email protected]
@@@ -4274,13 -4292,36 +4274,13 @@@ F:   include/linux/debugfs.
  F:    include/linux/kobj*
  F:    lib/kobj*
  
 -DRM DRIVERS
 -M:    David Airlie <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -M:    Jani Nikula <[email protected]>
 -M:    Sean Paul <[email protected]>
 -W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 +DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 +M:    Kevin Hilman <[email protected]>
 +M:    Nishanth Menon <[email protected]>
  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:    [email protected]
  
  DRM DRIVER FOR ARM PL111 CLCD
  M:    Eric Anholt <[email protected]>
@@@ -4293,6 -4334,14 +4293,6 @@@ M:     Dave Airlie <[email protected]
  S:    Odd Fixes
  F:    drivers/gpu/drm/ast/
  
 -DRM DRIVERS FOR BRIDGE CHIPS
 -M:    Archit Taneja <[email protected]>
 -M:    Andrzej Hajda <[email protected]>
 -R:    Laurent Pinchart <[email protected]>
 -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 <[email protected]>
  L:    [email protected]
@@@ -4300,130 -4349,68 +4300,130 @@@ T: git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/bochs/
  
 -DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 -M:    Dave Airlie <[email protected]>
 -M:    Gerd Hoffmann <[email protected]>
 -L:    [email protected]
 -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 DRIVER FOR INTEL I810 VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/i810/
 +F:    include/uapi/drm/i810_drm.h
  
 -RADEON and AMDGPU DRM DRIVERS
 -M:    Alex Deucher <[email protected]>
 -M:    Christian König <[email protected]>
 -L:    [email protected]
 -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 MATROX G200/G400 GRAPHICS CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/mga/
 +F:    include/uapi/drm/mga_drm.h
  
 -DRM PANEL DRIVERS
 -M:    Thierry Reding <[email protected]>
 +DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/mgag200/
 +
 +DRM DRIVER FOR MI0283QT
 +M:    Noralf Trønnes <[email protected]>
 +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 <[email protected]>
 +L:    [email protected]
  L:    [email protected]
 -T:    git git://anongit.freedesktop.org/tegra/linux.git
 +L:    [email protected]
 +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 <[email protected]>
 -M:    Jani Nikula <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
 -M:      Zhi Wang <[email protected]>
 -L:      [email protected]
 -L:      [email protected]
 -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 <[email protected]>
 +M:    Gerd Hoffmann <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +DRM DRIVER FOR QXL VIRTUAL GPU
 +M:    Dave Airlie <[email protected]>
 +M:    Gerd Hoffmann <[email protected]>
 +L:    [email protected]
 +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 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 TDFX VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/tdfx/
 +
 +DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/udl/
 +
 +DRM DRIVER FOR VMWARE VIRTUAL GPU
 +M:    "VMware Graphics" <[email protected]>
 +M:    Sinclair Yeh <[email protected]>
 +M:    Thomas Hellstrom <[email protected]>
  L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Jani Nikula <[email protected]>
 +M:    Sean Paul <[email protected]>
 +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  <[email protected]>
@@@ -4445,22 -4432,6 +4445,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Andrzej Hajda <[email protected]>
 +R:    Laurent Pinchart <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/bridge/
 +
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
  M:    Joonyoung Shim <[email protected]>
@@@ -4509,6 -4480,11 +4509,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 <[email protected]>
  M:    Philipp Zabel <[email protected]>
@@@ -4517,6 -4493,32 +4517,6 @@@ S:     Supporte
  F:    drivers/gpu/drm/mediatek/
  F:    Documentation/devicetree/bindings/display/mediatek/
  
 -DRM DRIVER FOR MI0283QT
 -M:    Noralf Trønnes <[email protected]>
 -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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -4529,6 -4531,21 +4529,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 <[email protected]>
 -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 <[email protected]>
  L:    [email protected]
@@@ -4541,6 -4558,15 +4541,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 <[email protected]>
 -M:    Gerd Hoffmann <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -4549,6 -4575,16 +4549,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 <[email protected]>
  M:    Vincent Abriou <[email protected]>
@@@ -4569,20 -4605,36 +4569,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 <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/gpu/drm/udl/
 -
 -DRM DRIVERS FOR VIVANTE GPU IP
 -M:    Lucas Stach <[email protected]>
 -R:    Russell King <[email protected]>
 -R:    Christian Gmeiner <[email protected]>
 -L:    [email protected]
 +DRM DRIVERS FOR TI LCDC
 +M:    Jyri Sarha <[email protected]>
 +R:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
  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" <[email protected]>
 -M:    Sinclair Yeh <[email protected]>
 -M:    Thomas Hellstrom <[email protected]>
 +DRM DRIVERS FOR TI OMAP
 +M:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
 -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 <[email protected]>
@@@ -4593,16 -4645,20 +4593,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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/gpu/drm/omapdrm/
 -F:    Documentation/devicetree/bindings/display/ti/
 -
 -DRM DRIVERS FOR TI LCDC
 -M:    Jyri Sarha <[email protected]>
 -R:    Tomi Valkeinen <[email protected]>
 +DRM DRIVERS FOR VIVANTE GPU IP
 +M:    Lucas Stach <[email protected]>
 +R:    Russell King <[email protected]>
 +R:    Christian Gmeiner <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  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 <[email protected]>
@@@ -4612,16 -4668,6 +4612,16 @@@ 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 <[email protected]>
 +L:    [email protected]
 +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/
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -4753,6 -4799,13 +4753,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 <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/i2c/dw9714.c
 -
  DYNAMIC DEBUG
  M:    Jason Baron <[email protected]>
  S:    Maintained
@@@ -4808,6 -4861,19 +4808,6 @@@ S:     Supporte
  F:    Documentation/filesystems/ecryptfs.txt
  F:    fs/ecryptfs/
  
 -EDAC-CORE
 -M:    Borislav Petkov <[email protected]>
 -M:    Mauro Carvalho Chehab <[email protected]>
 -M:    Mauro Carvalho Chehab <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -4829,19 -4895,6 +4829,19 @@@ S:    Supporte
  F:    drivers/edac/octeon_edac*
  F:    drivers/edac/thunderx_edac*
  
 +EDAC-CORE
 +M:    Borislav Petkov <[email protected]>
 +M:    Mauro Carvalho Chehab <[email protected]>
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
 -EDAC-I82443BXGX
 -M:    Tim Small <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/edac/i82443bxgx_edac.c
 -
  EDAC-I3000
  L:    [email protected]
  S:    Orphan
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
  
 +EDAC-I82443BXGX
 +M:    Tim Small <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/i82443bxgx_edac.c
 +
  EDAC-I82975X
  M:    Ranganathan Desikan <[email protected]>
  M:    "Arvind R." <[email protected]>
  S:    Maintained
  F:    drivers/edac/mpc85xx_edac.[ch]
  
 -EDAC-PND2
 -M:    Tony Luck <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/edac/pnd2_edac.[ch]
 -
  EDAC-PASEMI
  M:    Egor Martovetsky <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/pasemi_edac.c
  
 +EDAC-PND2
 +M:    Tony Luck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/pnd2_edac.[ch]
 +
  EDAC-R82600
  M:    Tim Small <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/skx_edac.c
  
 -EDAC-XGENE
 -APPLIED MICRO (APM) X-GENE SOC EDAC
 -M:     Loc Ho <[email protected]>
 -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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -4960,12 -5020,21 +4960,12 @@@ T:   git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/usb/misc/ua101.c
  
 -EXTENSIBLE FIRMWARE INTERFACE (EFI)
 -M:    Matt Fleming <[email protected]>
 -M:    Ard Biesheuvel <[email protected]>
 +EFI TEST DRIVER
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 +M:    Ivan Hu <[email protected]>
 +M:    Matt Fleming <[email protected]>
  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 <[email protected]>
@@@ -4982,6 -5051,13 +4982,6 @@@ M:     Peter Jones <[email protected]
  S:    Maintained
  F:    drivers/video/fbdev/efifb.c
  
 -EFI TEST DRIVER
 -L:    [email protected]
 -M:    Ivan Hu <[email protected]>
 -M:    Matt Fleming <[email protected]>
 -S:    Maintained
 -F:    drivers/firmware/efi/test/
 -
  EFS FILESYSTEM
  W:    http://aeschi.ch.eu.org/efs/
  S:    Orphan
@@@ -5010,34 -5086,6 +5010,34 @@@ M:    David Woodhouse <[email protected]
  L:    [email protected]
  S:    Maintained
  
 +Emulex 10Gbps iSCSI - OneConnect DRIVER
 +M:    Subbu Seetharaman <[email protected]>
 +M:    Ketan Mukadam <[email protected]>
 +M:    Jitendra Bhivare <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Ajit Khaparde <[email protected]>
 +M:    Sriharsha Basavapatna <[email protected]>
 +M:    Somnath Kotur <[email protected]>
 +L:    [email protected]
 +W:    http://www.emulex.com
 +S:    Supported
 +F:    drivers/net/ethernet/emulex/benet/
 +
 +EMULEX ONECONNECT ROCE DRIVER
 +M:    Selvin Xavier <[email protected]>
 +M:    Devesh Sharma <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Dick Kennedy <[email protected]>
@@@ -5088,22 -5136,14 +5088,22 @@@ F:   net/bridge
  ETHERNET PHY LIBRARY
  M:    Andrew Lunn <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    include/linux/phy.h
 -F:    include/linux/phy_fixed.h
 -F:    drivers/net/phy/
 +L:    [email protected]
 +S:    Maintained
 +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/trace/events/mdio.h
 +F:    include/uapi/linux/mdio.h
 +F:    include/uapi/linux/mii.h
  
  EXT2 FILE SYSTEM
  M:    Jan Kara <[email protected]>
  S:    Supported
  F:    security/integrity/evm/
  
 +EXTENSIBLE FIRMWARE INTERFACE (EFI)
 +M:    Matt Fleming <[email protected]>
 +M:    Ard Biesheuvel <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Chanwoo Choi <[email protected]>
@@@ -5177,19 -5201,6 +5177,19 @@@ S:    Supporte
  F:    arch/arc/plat-eznps
  F:    arch/arc/boot/dts/eznps.dts
  
 +F2FS FILE SYSTEM
 +M:    Jaegeuk Kim <[email protected]>
 +M:    Chao Yu <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -5197,6 -5208,23 +5197,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 -FC0011 TUNER DRIVER
 -M:    Michael Buesch <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/media/tuners/fc0011.h
 -F:    drivers/media/tuners/fc0011.c
 -
 -FC2580 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  S:    Maintained
@@@ -5221,23 -5249,6 +5221,23 @@@ M:    Thomas Petazzoni <thomas.petazzoni@f
  S:    Maintained
  F:    drivers/staging/fbtft/
  
 +FC0011 TUNER DRIVER
 +M:    Michael Buesch <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/tuners/fc0011.h
 +F:    drivers/media/tuners/fc0011.c
 +
 +FC2580 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 +M:    Claudiu Manoil <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cpm.c
  
 +FREESCALE IMX / MXC FEC DRIVER
 +M:    Fugang Duan <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -5435,11 -5429,29 +5435,11 @@@ S:   Maintaine
  F:    include/linux/platform_data/video-imxfb.h
  F:    drivers/video/fbdev/imxfb.c
  
 -FREESCALE QUAD SPI DRIVER
 -M:    Han Xu <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/mtd/spi-nor/fsl-quadspi.c
 -
 -FREESCALE SOC FS_ENET DRIVER
 -M:    Pantelis Antoniou <[email protected]>
 -M:    Vitaly Bordug <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/freescale/fs_enet/
 -F:    include/linux/fs_enet_pd.h
 -
 -FREESCALE IMX / MXC FEC DRIVER
 -M:    Fugang Duan <[email protected]>
 +FREESCALE QORIQ DPAA ETHERNET DRIVER
 +M:    Madalin Bucur <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -5448,11 -5460,20 +5448,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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/freescale/dpaa
 -
 -FREESCALE SOC DRIVERS
 -M:    Li Yang <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 +FREESCALE QUAD SPI DRIVER
 +M:    Han Xu <[email protected]>
 +L:    [email protected]
  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 <[email protected]>
@@@ -5462,6 -5483,13 +5462,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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/usb/gadget/udc/fsl*
 -
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/freescale/ucc_geth*
  
 -FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 -M:    Claudiu Manoil <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial/ucc_uart.c
  
 +FREESCALE SOC DRIVERS
 +M:    Li Yang <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/fsl/
 +F:    drivers/soc/fsl/
 +F:    include/linux/fsl/
 +
 +FREESCALE SOC FS_ENET DRIVER
 +M:    Pantelis Antoniou <[email protected]>
 +M:    Vitaly Bordug <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/fs_enet/
 +F:    include/linux/fs_enet_pd.h
 +
  FREESCALE SOC SOUND DRIVERS
  M:    Timur Tabi <[email protected]>
  M:    Nicolin Chen <[email protected]>
@@@ -5512,13 -5530,6 +5512,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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/gadget/udc/fsl*
 +
  FREEVXFS FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
  W:    ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@@ -5559,6 -5570,19 +5559,6 @@@ S:     Supporte
  F:    fs/crypto/
  F:    include/linux/fscrypt*.h
  
 -F2FS FILE SYSTEM
 -M:    Jaegeuk Kim <[email protected]>
 -M:    Chao Yu <[email protected]>
 -L:    [email protected]
 -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/
@@@ -5632,12 -5656,6 +5632,12 @@@ S:    Maintaine
  F:    kernel/gcov/
  F:    Documentation/dev-tools/gcov.rst
  
 +GDB KERNEL DEBUGGING HELPER SCRIPTS
 +M:    Jan Kiszka <[email protected]>
 +M:    Kieran Bingham <[email protected]>
 +S:    Supported
 +F:    scripts/gdb/
 +
  GDT SCSI DISK ARRAY CONTROLLER DRIVER
  M:    Achim Leubner <[email protected]>
  L:    [email protected]
@@@ -5645,6 -5663,12 +5645,6 @@@ W:     http://www.icp-vortex.com
  S:    Supported
  F:    drivers/scsi/gdt*
  
 -GDB KERNEL DEBUGGING HELPER SCRIPTS
 -M:    Jan Kiszka <[email protected]>
 -M:    Kieran Bingham <[email protected]>
 -S:    Supported
 -F:    scripts/gdb/
 -
  GEMTEK FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/uio/uio_pci_generic.c
  
 -GET_MAINTAINER SCRIPT
 -M:    Joe Perches <[email protected]>
 -S:    Maintained
 -F:    scripts/get_maintainer.pl
 -
  GENWQE (IBM Generic Workqueue Card)
  M:    Frank Haverkamp <[email protected]>
  M:    Guilherme G. Piccoli <[email protected]>
  S:    Supported
  F:    drivers/misc/genwqe/
  
 +GET_MAINTAINER SCRIPT
 +M:    Joe Perches <[email protected]>
 +S:    Maintained
 +F:    scripts/get_maintainer.pl
 +
  GFS2 FILE SYSTEM
  M:    Steven Whitehouse <[email protected]>
  M:    Bob Peterson <[email protected]>
  S:    Maintained
  F:    drivers/input/touchscreen/goodix.c
  
 +GPIO ACPI SUPPORT
 +M:    Mika Westerberg <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/acpi/gpio-properties.txt
 +F:    drivers/gpio/gpiolib-acpi.c
 +
  GPIO MOCKUP DRIVER
  M:    Bamvor Jian Zhang <[email protected]>
  L:    [email protected]
@@@ -5786,6 -5801,15 +5786,6 @@@ F:     include/asm-generic/gpio.
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
 -GPIO ACPI SUPPORT
 -M:    Mika Westerberg <[email protected]>
 -M:    Andy Shevchenko <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/acpi/gpio-properties.txt
 -F:    drivers/gpio/gpiolib-acpi.c
 -
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/aeroflex/
  
 -GREYBUS SUBSYSTEM
 -M:    Johan Hovold <[email protected]>
 -M:    Alex Elder <[email protected]>
 -M:    Greg Kroah-Hartman <[email protected]>
 -S:    Maintained
 -F:    drivers/staging/greybus/
 -L:    [email protected] (moderated for non-subscribers)
 -
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <[email protected]>
 -M:    Mark Greer <[email protected]>
 -S:    Maintained
 -F:    drivers/staging/greybus/audio_apbridgea.c
 -F:    drivers/staging/greybus/audio_apbridgea.h
 -F:    drivers/staging/greybus/audio_codec.c
 -F:    drivers/staging/greybus/audio_codec.h
 -F:    drivers/staging/greybus/audio_gb.c
 -F:    drivers/staging/greybus/audio_manager.c
 -F:    drivers/staging/greybus/audio_manager.h
 -F:    drivers/staging/greybus/audio_manager_module.c
 -F:    drivers/staging/greybus/audio_manager_private.h
 -F:    drivers/staging/greybus/audio_manager_sysfs.c
 -F:    drivers/staging/greybus/audio_module.c
 -F:    drivers/staging/greybus/audio_topology.c
 -
 -GREYBUS PROTOCOLS DRIVERS
 -M:    Rui Miguel Silva <[email protected]>
 -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 <[email protected]>
 -S:    Maintained
 -F:    drivers/staging/greybus/loopback.c
 -F:    drivers/staging/greybus/timesync.c
 -F:    drivers/staging/greybus/timesync_platform.c
 +M:    Mark Greer <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/audio_apbridgea.c
 +F:    drivers/staging/greybus/audio_apbridgea.h
 +F:    drivers/staging/greybus/audio_codec.c
 +F:    drivers/staging/greybus/audio_codec.h
 +F:    drivers/staging/greybus/audio_gb.c
 +F:    drivers/staging/greybus/audio_manager.c
 +F:    drivers/staging/greybus/audio_manager.h
 +F:    drivers/staging/greybus/audio_manager_module.c
 +F:    drivers/staging/greybus/audio_manager_private.h
 +F:    drivers/staging/greybus/audio_manager_sysfs.c
 +F:    drivers/staging/greybus/audio_module.c
 +F:    drivers/staging/greybus/audio_topology.c
  
 -GREYBUS PROTOCOLS DRIVERS
 +GREYBUS FW/HID/SPI PROTOCOLS DRIVERS
  M:    Viresh Kumar <[email protected]>
  S:    Maintained
  F:    drivers/staging/greybus/authentication.c
@@@ -5834,12 -5883,11 +5834,12 @@@ F:   drivers/staging/greybus/spi.
  F:    drivers/staging/greybus/spilib.c
  F:    drivers/staging/greybus/spilib.h
  
 -GREYBUS PROTOCOLS DRIVERS
 -M:    David Lin <[email protected]>
 +GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS
 +M:    Bryan O'Donoghue <[email protected]>
  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 <[email protected]>
@@@ -5848,30 -5896,6 +5848,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 <[email protected]>
 +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 <[email protected]>
 +M:    Alex Elder <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/
 +L:    [email protected] (moderated for non-subscribers)
 +
 +GREYBUS UART PROTOCOLS DRIVERS
 +M:    David Lin <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/greybus/uart.c
 +F:    drivers/staging/greybus/log.c
 +
  GS1662 VIDEO SERIALIZER
  M:    Charles-Antoine Couret <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    block/partitions/efi.*
  
 -STK1160 USB VIDEO CAPTURE DRIVER
 -M:    Ezequiel Garcia <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/usb/stk1160/
 -
  H8/300 ARCHITECTURE
  M:    Yoshinori Sato <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -5953,6 -5984,33 +5953,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 <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    mm/memory-failure.c
 -F:    mm/hwpoison-inject.c
 -
 -HYPERVISOR VIRTUAL CONSOLE DRIVER
 -L:    [email protected]
 -S:    Odd Fixes
 -F:    drivers/tty/hvc/
 -
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -5963,13 -6021,6 +5963,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 <[email protected]>
 +L:    [email protected]
 +W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 +S:    Maintained
 +F:    drivers/platform/x86/hdaps.c
 +
  HARDWARE MONITORING
  M:    Jean Delvare <[email protected]>
  M:    Guenter Roeck <[email protected]>
  S:    Maintained
  F:    sound/parisc/harmony.*
  
 +HDPVR USB VIDEO ENCODER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  S:    Supported
@@@ -6042,6 -6085,13 +6042,6 @@@ F:     drivers/block/cciss
  F:    include/linux/cciss_ioctl.h
  F:    include/uapi/linux/cciss_ioctl.h
  
 -OPA-VNIC DRIVER
 -M:    Dennis Dalessandro <[email protected]>
 -M:    Niranjana Vishwanathapura <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/infiniband/ulp/opa_vnic
 -
  HFI1 DRIVER
  M:    Mike Marciniszyn <[email protected]>
  M:    Dennis Dalessandro <[email protected]>
  S:    Maintained
  F:    net/hsr/
  
 +HT16K33 LED CONTROLLER DRIVER
 +M:    Robin van der Gracht <[email protected]>
 +S:    Maintained
 +F:    drivers/auxdisplay/ht16k33.c
 +F:    Documentation/devicetree/bindings/display/ht16k33.txt
 +
  HTCPEN TOUCHSCREEN DRIVER
  M:    Pau Oliva Fora <[email protected]>
  L:    [email protected]
@@@ -6244,13 -6288,6 +6244,13 @@@ W:    https://linuxtv.or
  S:    Supported
  F:    drivers/media/platform/sti/hva
  
 +HWPOISON MEMORY FAILURE HANDLING
 +M:    Naoya Horiguchi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    mm/memory-failure.c
 +F:    mm/hwpoison-inject.c
 +
  Hyper-V CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
@@@ -6273,18 -6310,6 +6273,18 @@@ F:    include/linux/hyperv.
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
 +HYPERVISOR VIRTUAL CONSOLE DRIVER
 +L:    [email protected]
 +S:    Odd Fixes
 +F:    drivers/tty/hvc/
 +
 +I2C ACPI SUPPORT
 +M:    Mika Westerberg <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/i2c-core-acpi.c
 +
  I2C MUXES
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -6307,36 -6332,6 +6307,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-taos-evm
 +F:    drivers/i2c/busses/i2c-taos-evm.c
 +
 +I2C-TINY-USB DRIVER
 +M:    Till Harbaum <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/i2c-stub.c
  
 -I2C SUBSYSTEM
 -M:    Wolfram Sang <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/i2c/i2c-core-acpi.c
 -
 -I2C-TAOS-EVM DRIVER
 -M:    Jean Delvare <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/i2c/busses/i2c-taos-evm
 -F:    drivers/i2c/busses/i2c-taos-evm.c
 -
 -I2C-TINY-USB DRIVER
 -M:    Till Harbaum <[email protected]>
 -L:    [email protected]
 -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" <[email protected]>
  S:    Maintained
@@@ -6402,15 -6434,17 +6402,15 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/ia64/
  
 -IBM Power VMX Cryptographic instructions
 -M:    Leonidas S. Barbosa <[email protected]>
 -M:    Paulo Flabiano Smorigo <[email protected]>
 -L:    [email protected]
 +IBM Power 842 compression accelerator
 +M:    Haren Myneni <[email protected]>
  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 <[email protected]>
@@@ -6425,29 -6459,33 +6425,29 @@@ 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 <[email protected]>
 -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 <[email protected]>
  S:    Supported
  F:    drivers/scsi/ipr.*
  
 -IBM Power Virtual Ethernet Device Driver
 +IBM Power SRIOV Virtual NIC Device Driver
  M:    Thomas Falcon <[email protected]>
 +M:    John Allen <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/ethernet/ibm/ibmveth.*
 +F:    drivers/net/ethernet/ibm/ibmvnic.*
  
 -IBM Power SRIOV Virtual NIC Device Driver
 +IBM Power Virtual Ethernet Device Driver
  M:    Thomas Falcon <[email protected]>
 -M:    John Allen <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/ethernet/ibm/ibmvnic.*
 +F:    drivers/net/ethernet/ibm/ibmveth.*
 +
 +IBM Power Virtual FC Device Drivers
 +M:    Tyrel Datwyler <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/ibmvscsi/ibmvfc*
  
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <[email protected]>
  S:    Supported
  F:    drivers/scsi/ibmvscsi_tgt/
  
 -IBM Power Virtual FC Device Drivers
 -M:    Tyrel Datwyler <[email protected]>
 -L:    [email protected]
 +IBM Power VMX Cryptographic instructions
 +M:    Leonidas S. Barbosa <[email protected]>
 +M:    Paulo Flabiano Smorigo <[email protected]>
 +L:    [email protected]
  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
  F:    drivers/scsi/ips.*
  
  ICH LPC AND GPIO DRIVER
 -M:    Peter Tyser <[email protected]>
 -S:    Maintained
 -F:    drivers/mfd/lpc_ich.c
 -F:    drivers/gpio/gpio-ich.c
 -
 -IDT VersaClock 5 CLOCK DRIVER
 -M:    Marek Vasut <[email protected]>
 +M:    Peter Tyser <[email protected]>
  S:    Maintained
 -F:    drivers/clk/clk-versaclock5.c
 +F:    drivers/mfd/lpc_ich.c
 +F:    drivers/gpio/gpio-ich.c
  
  IDE SUBSYSTEM
  M:    "David S. Miller" <[email protected]>
@@@ -6496,13 -6533,6 +6496,13 @@@ F:    Documentation/ide
  F:    drivers/ide/
  F:    include/linux/ide.h
  
 +IDE/ATAPI DRIVERS
 +M:    Borislav Petkov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/cdrom/ide-cd
 +F:    drivers/ide/ide-cd*
 +
  IDEAPAD LAPTOP EXTRAS DRIVER
  M:    Ike Panhc <[email protected]>
  L:    [email protected]
@@@ -6517,10 -6547,12 +6517,10 @@@ W:   https://github.com/o2genum/ideapad-s
  S:    Maintained
  F:    drivers/input/misc/ideapad_slidebar.c
  
 -IDE/ATAPI DRIVERS
 -M:    Borislav Petkov <[email protected]>
 -L:    [email protected]
 +IDT VersaClock 5 CLOCK DRIVER
 +M:    Marek Vasut <[email protected]>
  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 <[email protected]>
@@@ -6610,16 -6642,6 +6610,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 <[email protected]>
 +S:    Maintained
 +F:    drivers/media/rc/img-ir/
 +
 +IMS TWINTURBO FRAMEBUFFER DRIVER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/video/fbdev/imsttfb.c
 +
  INA209 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -6645,6 -6667,37 +6645,6 @@@ W:     http://industrypack.sourceforge.ne
  S:    Maintained
  F:    drivers/ipack/
  
 -INGENIC JZ4780 DMA Driver
 -M:    Zubair Lutfullah Kakakhel <[email protected]>
 -S:    Maintained
 -F:    drivers/dma/dma-jz4780.c
 -
 -INGENIC JZ4780 NAND DRIVER
 -M:    Harvey Hunt <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/mtd/nand/jz4780_*
 -
 -INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 -M:    Mimi Zohar <[email protected]>
 -M:    Dmitry Kasatkin <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
 -S:    Maintained
 -F:    drivers/media/rc/img-ir/
 -
 -IMS TWINTURBO FRAMEBUFFER DRIVER
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/video/fbdev/imsttfb.c
 -
  INFINIBAND SUBSYSTEM
  M:    Doug Ledford <[email protected]>
  M:    Sean Hefty <[email protected]>
@@@ -6661,17 -6714,6 +6661,17 @@@ F:    include/uapi/linux/if_infiniband.
  F:    include/uapi/rdma/
  F:    include/rdma/
  
 +INGENIC JZ4780 DMA Driver
 +M:    Zubair Lutfullah Kakakhel <[email protected]>
 +S:    Maintained
 +F:    drivers/dma/dma-jz4780.c
 +
 +INGENIC JZ4780 NAND DRIVER
 +M:    Harvey Hunt <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/jz4780_*
 +
  INOTIFY
  M:    John McCutchan <[email protected]>
  M:    Robert Love <[email protected]>
@@@ -6710,22 -6752,6 +6710,22 @@@ F:    drivers/crypto/inside-secure
  S:    Maintained
  L:    [email protected]
  
 +INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 +M:    Mimi Zohar <[email protected]>
 +M:    Dmitry Kasatkin <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/video/fbdev/i810/
 +
  INTEL ASoC BDW/HSW DRIVERS
  M:    Jie Yang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -6743,20 -6769,96 +6743,20 @@@ T:   git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
 -INTEL HID EVENT DRIVER
 -M:    Alex Hung <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/intel-hid.c
 -
 -INTEL VIRTUAL BUTTON DRIVER
 -M:    AceLan Kao <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/intel-vbtn.c
 -
 -INTEL IDLE DRIVER
 -M:    Jacob Pan <[email protected]>
 -M:    Len Brown <[email protected]>
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
 -B:    https://bugzilla.kernel.org
 -S:    Supported
 -F:    drivers/idle/intel_idle.c
 -
 -INTEL INTEGRATED SENSOR HUB DRIVER
 -M:    Srinivas Pandruvada <[email protected]>
 -M:    Jiri Kosina <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/hid/intel-ish-hid/
 -
 -INTEL PSTATE DRIVER
 -M:    Srinivas Pandruvada <[email protected]>
 -M:    Len Brown <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/cpufreq/intel_pstate.c
 -
 -INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -M:    Maik Broemme <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/fb/intelfb.txt
 -F:    drivers/video/fbdev/intelfb/
 -
 -INTEL 810/815 FRAMEBUFFER DRIVER
 -M:    Antonino Daplas <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/video/fbdev/i810/
 -
 -INTEL MENLOW THERMAL DRIVER
 -M:    Sujith Thomas <[email protected]>
 -L:    [email protected]
 -W:    https://01.org/linux-acpi
 -S:    Supported
 -F:    drivers/platform/x86/intel_menlow.c
 -
 -INTEL I/OAT DMA DRIVER
 -M:    Dave Jiang <[email protected]>
 -R:    Dan Williams <[email protected]>
 -L:    [email protected]
 -Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
 -S:    Supported
 -F:    drivers/dma/ioat*
 -
 -INTEL IOMMU (VT-d)
 -M:    David Woodhouse <[email protected]>
 -L:    [email protected]
 -T:    git git://git.infradead.org/iommu-2.6.git
 +INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 +M:    Daniel Vetter <[email protected]>
 +M:    Jani Nikula <[email protected]>
 +L:    [email protected]
 +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/iommu/intel-iommu.c
 -F:    include/linux/intel-iommu.h
 -
 -INTEL IOP-ADMA DMA DRIVER
 -R:    Dan Williams <[email protected]>
 -S:    Odd fixes
 -F:    drivers/dma/iop-adma.c
 -
 -INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    arch/arm/mach-ixp4xx/include/mach/qmgr.h
 -F:    arch/arm/mach-ixp4xx/include/mach/npe.h
 -F:    arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
 -F:    arch/arm/mach-ixp4xx/ixp4xx_npe.c
 -F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 -F:    drivers/net/wan/ixp4xx_hss.c
 -
 -INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    drivers/char/hw_random/ixp4xx-rng.c
 +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 <[email protected]>
@@@ -6781,80 -6883,75 +6781,80 @@@ F:   drivers/net/ethernet/intel
  F:    drivers/net/ethernet/intel/*/
  F:    include/linux/avf/virtchnl.h
  
 -INTEL RDMA RNIC DRIVER
 -M:     Faisal Latif <[email protected]>
 -M:     Shiraz Saleem <[email protected]>
 -L:     [email protected]
 -S:     Supported
 -F:     drivers/infiniband/hw/i40iw/
 -
 -INTEL MERRIFIELD GPIO DRIVER
 -M:    Andy Shevchenko <[email protected]>
 -L:    [email protected]
 +INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 +M:    Maik Broemme <[email protected]>
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/gpio/gpio-merrifield.c
 +F:    Documentation/fb/intelfb.txt
 +F:    drivers/video/fbdev/intelfb/
  
 -INTEL-MID GPIO DRIVER
 -M:    David Cohen <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/gpio/gpio-intel-mid.c
 +INTEL GVT-g DRIVERS (Intel GPU Virtualization)
 +M:    Zhenyu Wang <[email protected]>
 +M:    Zhi Wang <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    https://01.org/igvt-g
 +T:    git https://github.com/01org/gvt-linux.git
 +S:    Supported
 +F:    drivers/gpu/drm/i915/gvt/
  
 -INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 -M:    Stanislav Yakovlev <stas.yakovlev@gmail.com>
 -L:    linux-wireless@vger.kernel.org
 +INTEL HID EVENT DRIVER
 +M:    Alex Hung <alex.hung@canonical.com>
 +L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    Documentation/networking/README.ipw2100
 -F:    Documentation/networking/README.ipw2200
 -F:    drivers/net/wireless/intel/ipw2x00/
 +F:    drivers/platform/x86/intel-hid.c
  
 -INTEL(R) TRACE HUB
 -M:    Alexander Shishkin <[email protected]>
 +INTEL I/OAT DMA DRIVER
 +M:    Dave Jiang <[email protected]>
 +R:    Dan Williams <[email protected]>
 +L:    [email protected]
 +Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Supported
 -F:    Documentation/trace/intel_th.txt
 -F:    drivers/hwtracing/intel_th/
 +F:    drivers/dma/ioat*
  
 -INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 -M:    Ning Sun <[email protected]>
 -L:    [email protected]
 -W:    http://tboot.sourceforge.net
 -T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 +INTEL IDLE DRIVER
 +M:    Jacob Pan <[email protected]>
 +M:    Len Brown <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
 +B:    https://bugzilla.kernel.org
  S:    Supported
 -F:    Documentation/intel_txt.txt
 -F:    include/linux/tboot.h
 -F:    arch/x86/kernel/tboot.c
 +F:    drivers/idle/intel_idle.c
  
 -INTEL WIRELESS WIMAX CONNECTION 2400
 -M:    Inaky Perez-Gonzalez <[email protected]>
 -M:    [email protected]
 -L:    [email protected] (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 INTEGRATED SENSOR HUB DRIVER
 +M:    Srinivas Pandruvada <[email protected]>
 +M:    Jiri Kosina <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/intel-ish-hid/
  
 -INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 -M:    Stanislaw Gruszka <[email protected]>
 -L:    [email protected]
 +INTEL IOMMU (VT-d)
 +M:    David Woodhouse <[email protected]>
 +L:    [email protected]
 +T:    git git://git.infradead.org/iommu-2.6.git
  S:    Supported
 -F:    drivers/net/wireless/intel/iwlegacy/
 +F:    drivers/iommu/intel-iommu.c
 +F:    include/linux/intel-iommu.h
  
 -INTEL WIRELESS WIFI LINK (iwlwifi)
 -M:    Johannes Berg <[email protected]>
 -M:    Emmanuel Grumbach <[email protected]>
 -M:    Luca Coelho <[email protected]>
 -M:    Intel Linux Wireless <[email protected]>
 -L:    [email protected]
 -W:    http://intellinuxwireless.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 -S:    Supported
 -F:    drivers/net/wireless/intel/iwlwifi/
 +INTEL IOP-ADMA DMA DRIVER
 +R:    Dan Williams <[email protected]>
 +S:    Odd fixes
 +F:    drivers/dma/iop-adma.c
 +
 +INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 +M:    Krzysztof Halasa <[email protected]>
 +S:    Maintained
 +F:    arch/arm/mach-ixp4xx/include/mach/qmgr.h
 +F:    arch/arm/mach-ixp4xx/include/mach/npe.h
 +F:    arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
 +F:    arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 +F:    drivers/net/wan/ixp4xx_hss.c
 +
 +INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 +M:    Deepak Saxena <[email protected]>
 +S:    Maintained
 +F:    drivers/char/hw_random/ixp4xx-rng.c
  
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <[email protected]>
@@@ -6867,19 -6964,6 +6867,19 @@@ F:    drivers/watchdog/mei_wdt.
  F:    Documentation/misc-devices/mei/*
  F:    samples/mei/*
  
 +INTEL MENLOW THERMAL DRIVER
 +M:    Sujith Thomas <[email protected]>
 +L:    [email protected]
 +W:    https://01.org/linux-acpi
 +S:    Supported
 +F:    drivers/platform/x86/intel_menlow.c
 +
 +INTEL MERRIFIELD GPIO DRIVER
 +M:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-merrifield.c
 +
  INTEL MIC DRIVERS (mic)
  M:    Sudeep Dutt <[email protected]>
  M:    Ashutosh Dixit <[email protected]>
@@@ -6889,21 -6973,13 +6889,21 @@@ W:   http://software.intel.com/en-us/mic-
  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/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 <[email protected]>
 +M:    Vishwanath Somayaji <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/include/asm/pmc_core.h
 +F:    drivers/platform/x86/intel_pmc_core*
 +
  INTEL PMC/P-Unit IPC DRIVER
  M:    Zha Qipeng<[email protected]>
  L:    [email protected]
@@@ -6913,28 -6989,6 +6913,28 @@@ F:    drivers/platform/x86/intel_punit_ipc
  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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/README.ipw2100
 +F:    Documentation/networking/README.ipw2200
 +F:    drivers/net/wireless/intel/ipw2x00/
 +
 +INTEL PSTATE DRIVER
 +M:    Srinivas Pandruvada <[email protected]>
 +M:    Len Brown <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/cpufreq/intel_pstate.c
 +
 +INTEL RDMA RNIC DRIVER
 +M:    Faisal Latif <[email protected]>
 +M:    Shiraz Saleem <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/hw/i40iw/
 +
  INTEL TELEMETRY DRIVER
  M:    Souvik Kumar Chakravarty <[email protected]>
  L:    [email protected]
@@@ -6942,60 -6996,13 +6942,60 @@@ S:   Maintaine
  F:    arch/x86/include/asm/intel_telemetry.h
  F:    drivers/platform/x86/intel_telemetry*
  
 -INTEL PMC CORE DRIVER
 -M:    Rajneesh Bhardwaj <[email protected]>
 -M:    Vishwanath Somayaji <[email protected]>
 +INTEL VIRTUAL BUTTON DRIVER
 +M:    AceLan Kao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    arch/x86/include/asm/pmc_core.h
 -F:    drivers/platform/x86/intel_pmc_core*
 +F:    drivers/platform/x86/intel-vbtn.c
 +
 +INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 +M:    Stanislaw Gruszka <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wireless/intel/iwlegacy/
 +
 +INTEL WIRELESS WIFI LINK (iwlwifi)
 +M:    Johannes Berg <[email protected]>
 +M:    Emmanuel Grumbach <[email protected]>
 +M:    Luca Coelho <[email protected]>
 +M:    Intel Linux Wireless <[email protected]>
 +L:    [email protected]
 +W:    http://intellinuxwireless.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 +S:    Supported
 +F:    drivers/net/wireless/intel/iwlwifi/
 +
 +INTEL WIRELESS WIMAX CONNECTION 2400
 +M:    Inaky Perez-Gonzalez <[email protected]>
 +M:    [email protected]
 +L:    [email protected] (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(R) TRACE HUB
 +M:    Alexander Shishkin <[email protected]>
 +S:    Supported
 +F:    Documentation/trace/intel_th.txt
 +F:    drivers/hwtracing/intel_th/
 +
 +INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 +M:    Ning Sun <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-intel-mid.c
  
  INVENSENSE MPU-3050 GYROSCOPE DRIVER
  M:    Linus Walleij <[email protected]>
@@@ -7041,6 -7048,13 +7041,6 @@@ F:     drivers/char/ipmi
  F:    include/linux/ipmi*
  F:    include/uapi/linux/ipmi*
  
 -QCOM AUDIO (ASoC) DRIVERS
 -M:    Patrick Lai <[email protected]>
 -M:    Banajit Goswami <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    sound/soc/qcom/
 -
  IPS SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <[email protected]>
  L:    [email protected]
@@@ -7087,15 -7101,6 +7087,15 @@@ F:    drivers/net/irda
  F:    include/net/irda/
  F:    net/irda/
  
 +IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 +M:    Marc Zyngier <[email protected]>
 +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 <[email protected]>
  L:    [email protected]
@@@ -7110,9 -7115,19 +7110,9 @@@ M:     Marc Zyngier <[email protected]
  L:    [email protected]
  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 <[email protected]>
 -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 <[email protected]>
  S:    Maintained
@@@ -7120,6 -7135,13 +7120,6 @@@ F:     Documentation/isa.tx
  F:    drivers/base/isa.c
  F:    include/linux/isa.h
  
 -ISAPNP
 -M:    Jaroslav Kysela <[email protected]>
 -S:    Maintained
 -F:    Documentation/isapnp.txt
 -F:    drivers/pnp/isapnp/
 -F:    include/linux/isapnp.h
 -
  ISA RADIO MODULE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -7128,12 -7150,11 +7128,12 @@@ W:   https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-isa*
  
 -iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 -M:    Peter Jones <[email protected]>
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 +ISAPNP
 +M:    Jaroslav Kysela <[email protected]>
  S:    Maintained
 -F:    drivers/firmware/iscsi_ibft*
 +F:    Documentation/isapnp.txt
 +F:    drivers/pnp/isapnp/
 +F:    include/linux/isapnp.h
  
  ISCSI
  M:    Lee Duncan <[email protected]>
@@@ -7144,12 -7165,6 +7144,12 @@@ S:    Maintaine
  F:    drivers/scsi/*iscsi*
  F:    include/scsi/*iscsi*
  
 +iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 +M:    Peter Jones <[email protected]>
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +S:    Maintained
 +F:    drivers/firmware/iscsi_ibft*
 +
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
  M:    Or Gerlitz <[email protected]>
  M:    Sagi Grimberg <[email protected]>
@@@ -7405,6 -7420,27 +7405,6 @@@ S:     Maintaine
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/kvm/svm.c
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 -M:    Alexander Graf <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -M:    Cornelia Huck <[email protected]>
 -L:    [email protected]
 -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
  M:    Christoffer Dall <[email protected]>
  M:    Marc Zyngier <[email protected]>
@@@ -7419,15 -7455,6 +7419,15 @@@ F:    arch/arm/kvm
  F:    virt/kvm/arm/
  F:    include/kvm/arm_*
  
 +KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 +M:    Alexander Graf <[email protected]>
 +L:    [email protected]
 +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 ARM64 (KVM/arm64)
  M:    Christoffer Dall <[email protected]>
  M:    Marc Zyngier <[email protected]>
@@@ -7446,18 -7473,6 +7446,18 @@@ 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 <[email protected]>
 +M:    Cornelia Huck <[email protected]>
 +L:    [email protected]
 +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
 +
  KERNFS
  M:    Greg Kroah-Hartman <[email protected]>
  M:    Tejun Heo <[email protected]>
@@@ -7475,15 -7490,17 +7475,15 @@@ F:   include/linux/kexec.
  F:    include/uapi/linux/kexec.h
  F:    kernel/kexec*
  
 -KEYS/KEYRINGS:
 -M:    David Howells <[email protected]>
 +KEYS-ENCRYPTED
 +M:    Mimi Zohar <[email protected]>
 +M:    David Safford <[email protected]>
 +L:    [email protected]
  L:    [email protected]
 -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 <[email protected]>
@@@ -7496,17 -7513,15 +7496,17 @@@ F:   include/keys/trusted-type.
  F:    security/keys/trusted.c
  F:    security/keys/trusted.h
  
 -KEYS-ENCRYPTED
 -M:    Mimi Zohar <[email protected]>
 -M:    David Safford <[email protected]>
 -L:    [email protected]
 +KEYS/KEYRINGS:
 +M:    David Howells <[email protected]>
  L:    [email protected]
 -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 <[email protected]>
@@@ -7650,6 -7665,16 +7650,6 @@@ F:     drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 -LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 -M:    Tejun Heo <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -7693,21 -7718,22 +7693,21 @@@ 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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  S:    Maintained
  F:    tools/lib/lockdep/
  
 -LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 -M:    Dan Williams <[email protected]>
 -L:    [email protected]
 -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
 -
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
  M:    Ross Zwisler <[email protected]>
  L:    [email protected]
@@@ -7715,6 -7741,7 +7715,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 <[email protected]>
@@@ -7730,18 -7757,6 +7730,18 @@@ Q:    https://patchwork.kernel.org/project
  S:    Supported
  F:    drivers/nvdimm/pmem*
  
 +LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 +M:    Dan Williams <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  W:    http://github/OpenChannelSSD
@@@ -7751,14 -7766,6 +7751,14 @@@ F:    drivers/lightnvm
  F:    include/linux/lightnvm.h
  F:    include/uapi/linux/lightnvm.h
  
 +LINUX FOR POWER MACINTOSH
 +M:    Benjamin Herrenschmidt <[email protected]>
 +W:    http://www.penguinppc.org/
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/powerpc/platforms/powermac/
 +F:    drivers/macintosh/
 +
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Benjamin Herrenschmidt <[email protected]>
  M:    Paul Mackerras <[email protected]>
@@@ -7792,6 -7799,14 +7792,6 @@@ N:     powern
  N:    [^a-z0-9]ps3
  N:    pseries
  
 -LINUX FOR POWER MACINTOSH
 -M:    Benjamin Herrenschmidt <[email protected]>
 -W:    http://www.penguinppc.org/
 -L:    [email protected]
 -S:    Maintained
 -F:    arch/powerpc/platforms/powermac/
 -F:    drivers/macintosh/
 -
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Anatolij Gustschin <[email protected]>
  L:    [email protected]
@@@ -7809,6 -7824,19 +7809,6 @@@ S:     Maintaine
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
  
 -LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 -L:    [email protected]
 -S:    Orphan
 -F:    arch/powerpc/*/*virtex*
 -F:    arch/powerpc/*/*/*virtex*
 -
 -LINUX FOR POWERPC EMBEDDED PPC8XX
 -M:    Vitaly Bordug <[email protected]>
 -W:    http://www.penguinppc.org/
 -L:    [email protected]
 -S:    Maintained
 -F:    arch/powerpc/platforms/8xx/
 -
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
  M:    Scott Wood <[email protected]>
  M:    Kumar Gala <[email protected]>
@@@ -7820,19 -7848,6 +7820,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 <[email protected]>
 +W:    http://www.penguinppc.org/
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/powerpc/platforms/8xx/
 +
 +LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 +L:    [email protected]
 +S:    Orphan
 +F:    arch/powerpc/*/*virtex*
 +F:    arch/powerpc/*/*/*virtex*
 +
  LINUX FOR POWERPC PA SEMI PWRFICIENT
  L:    [email protected]
  S:    Orphan
@@@ -7840,11 -7855,6 +7840,11 @@@ F:    arch/powerpc/platforms/pasemi
  F:    drivers/*/*pasemi*
  F:    drivers/*/*/*pasemi*
  
 +LINUX KERNEL DUMP TEST MODULE (LKDTM)
 +M:    Kees Cook <[email protected]>
 +S:    Maintained
 +F:    drivers/misc/lkdtm*
 +
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <[email protected]>
  L:    [email protected]
@@@ -7874,6 -7884,11 +7874,6 @@@ F:     samples/livepatch
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
  
 -LINUX KERNEL DUMP TEST MODULE (LKDTM)
 -M:    Kees Cook <[email protected]>
 -S:    Maintained
 -F:    drivers/misc/lkdtm*
 -
  LLC (802.2)
  L:    [email protected]
  S:    Odd fixes
@@@ -7926,13 -7941,6 +7926,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/lmedm04*
  
 +LOADPIN SECURITY MODULE
 +M:    Kees Cook <[email protected]>
 +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 <[email protected]>
  M:    Ingo Molnar <[email protected]>
@@@ -8223,6 -8231,14 +8223,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 <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -8231,14 -8247,6 +8231,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 <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  S:    Maintained
  F:    drivers/iio/dac/cio-dac.c
  
 -MEDIA DRIVERS FOR RENESAS - DRIF
 -M:    Ramesh Shanmugasundaram <[email protected]>
 +MEDIA DRIVERS FOR ASCOT2E
 +M:    Sergey Kozlov <[email protected]>
 +M:    Abylay Ospan <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +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 <[email protected]>
 +M:    Abylay Ospan <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -8313,6 -8310,43 +8313,6 @@@ F:     drivers/staging/media/imx
  F:    include/linux/imx-media.h
  F:    include/media/imx.h
  
 -MEDIA DRIVERS FOR RENESAS - FCP
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    Documentation/devicetree/bindings/media/renesas,fcp.txt
 -F:    drivers/media/platform/rcar-fcp.c
 -F:    include/media/rcar-fcp.h
 -
 -MEDIA DRIVERS FOR RENESAS - FDP1
 -M:    Kieran Bingham <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    Documentation/devicetree/bindings/media/renesas,fdp1.txt
 -F:    drivers/media/platform/rcar_fdp1.c
 -
 -MEDIA DRIVERS FOR RENESAS - VIN
 -M:    Niklas Söderlund <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    Documentation/devicetree/bindings/media/rcar_vin.txt
 -F:    drivers/media/platform/rcar-vin/
 -
 -MEDIA DRIVERS FOR RENESAS - VSP1
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Supported
 -F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
 -F:    drivers/media/platform/vsp1/
 -
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -8322,7 -8356,7 +8322,7 @@@ T:      git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/helene*
  
 -MEDIA DRIVERS FOR ASCOT2E
 +MEDIA DRIVERS FOR HORUS3A
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -8330,9 -8364,9 +8330,9 @@@ W:      https://linuxtv.or
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    drivers/media/dvb-frontends/ascot2e*
 +F:    drivers/media/dvb-frontends/horus3a*
  
 -MEDIA DRIVERS FOR CXD2841ER
 +MEDIA DRIVERS FOR LNBH25
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -8340,9 -8374,9 +8340,9 @@@ W:      https://linuxtv.or
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    drivers/media/dvb-frontends/cxd2841er*
 +F:    drivers/media/dvb-frontends/lnbh25*
  
 -MEDIA DRIVERS FOR HORUS3A
 +MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -8350,53 -8384,27 +8350,53 @@@ W:   https://linuxtv.or
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    drivers/media/dvb-frontends/horus3a*
 +F:    drivers/media/pci/netup_unidvb/*
  
 -MEDIA DRIVERS FOR LNBH25
 -M:    Sergey Kozlov <[email protected]>
 -M:    Abylay Ospan <[email protected]>
 +MEDIA DRIVERS FOR RENESAS - DRIF
 +M:    Ramesh Shanmugasundaram <[email protected]>
  L:    [email protected]
 -W:    https://linuxtv.org
 -W:    http://netup.tv/
 +L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    drivers/media/dvb-frontends/lnbh25*
 +F:    Documentation/devicetree/bindings/media/renesas,drif.txt
 +F:    drivers/media/platform/rcar_drif.c
  
 -MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
 -M:    Sergey Kozlov <[email protected]>
 -M:    Abylay Ospan <[email protected]>
 +MEDIA DRIVERS FOR RENESAS - FCP
 +M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
 -W:    https://linuxtv.org
 -W:    http://netup.tv/
 +L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    drivers/media/pci/netup_unidvb/*
 +F:    Documentation/devicetree/bindings/media/renesas,fcp.txt
 +F:    drivers/media/platform/rcar-fcp.c
 +F:    include/media/rcar-fcp.h
 +
 +MEDIA DRIVERS FOR RENESAS - FDP1
 +M:    Kieran Bingham <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,fdp1.txt
 +F:    drivers/media/platform/rcar_fdp1.c
 +
 +MEDIA DRIVERS FOR RENESAS - VIN
 +M:    Niklas Söderlund <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/rcar_vin.txt
 +F:    drivers/media/platform/rcar-vin/
 +
 +MEDIA DRIVERS FOR RENESAS - VSP1
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
 +F:    drivers/media/platform/vsp1/
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -8432,8 -8440,17 +8432,8 @@@ MEDIATEK JPEG DRIVE
  M:    Rick Chang <[email protected]>
  M:    Bin Liu <[email protected]>
  S:    Supported
 -F:    drivers/media/platform/mtk-jpeg/
 -F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
 -
 -MEDIATEK MEDIA DRIVER
 -M:    Tiffany Lin <[email protected]>
 -M:    Andrew-CT Chen <[email protected]>
 -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
 +F:    drivers/media/platform/mtk-jpeg/
 +F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
  
  MEDIATEK MDP DRIVER
  M:    Minghsiu Tsai <[email protected]>
@@@ -8444,15 -8461,6 +8444,15 @@@ 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 <[email protected]>
 +M:    Andrew-CT Chen <[email protected]>
 +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 <[email protected]>
  L:    [email protected]
@@@ -8460,9 -8468,9 +8460,9 @@@ S:      Maintaine
  F:    drivers/net/wireless/mediatek/mt7601u/
  
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
 -M:      Sean Wang <[email protected]>
 -S:      Maintained
 -F:      drivers/char/hw_random/mtk-rng.c
 +M:    Sean Wang <[email protected]>
 +S:    Maintained
 +F:    drivers/char/hw_random/mtk-rng.c
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
@@@ -8484,13 -8492,6 +8484,13 @@@ F:    Documentation/scsi/megaraid.tx
  F:    drivers/scsi/megaraid.*
  F:    drivers/scsi/megaraid/
  
 +MELEXIS MLX90614 DRIVER
 +M:    Crt Mori <[email protected]>
 +L:    [email protected]
 +W:    http://www.melexis.com
 +S:    Supported
 +F:    drivers/iio/temperature/mlx90614.c
 +
  MELFAS MIP4 TOUCHSCREEN DRIVER
  M:    Sangwon Jee <[email protected]>
  W:    http://www.melfas.com
@@@ -8551,56 -8552,6 +8551,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Matan Barak <[email protected]>
 +M:    Leon Romanovsky <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Leon Romanovsky <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Michael Shych <[email protected]>
@@@ -8618,10 -8569,26 +8618,10 @@@ F:   drivers/leds/leds-mlxcpld.
  F:    Documentation/leds/leds-mlxcpld.txt
  
  MELLANOX PLATFORM DRIVER
 -M:      Vadim Pasternak <[email protected]>
 -L:      [email protected]
 -S:      Supported
 -F:      drivers/platform/x86/mlx-platform.c
 -
 -MELLANOX MLX CPLD HOTPLUG DRIVER
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/platform/x86/mlxcpld-hotplug.c
 -F:    include/linux/platform_data/mlxcpld-hotplug.h
 -
 -SOFT-ROCE DRIVER (rxe)
 -M:    Moni Shoua <[email protected]>
 -L:    [email protected]
 -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
 +F:    drivers/platform/x86/mlx-platform.c
  
  MEMBARRIER SUPPORT
  M:    Mathieu Desnoyers <[email protected]>
@@@ -8743,18 -8710,6 +8743,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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -8777,16 -8732,6 +8777,16 @@@ F:    Documentation/devicetree/bindings/mi
  F:    Documentation/mips/
  F:    arch/mips/
  
 +MIPS BOSTON DEVELOPMENT BOARD
 +M:    Paul Burton <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -8802,6 -8747,16 +8802,6 @@@ F:     arch/mips/include/asm/mach-loongson3
  F:    drivers/*/*loongson1*
  F:    drivers/*/*/*loongson1*
  
 -MIPS BOSTON DEVELOPMENT BOARD
 -M:    Paul Burton <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -8810,15 -8765,67 +8810,15 @@@ W:   https://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/radio/radio-miropcm20*
  
 -MELLANOX MLX4 core VPI driver
 -M:    Tariq Toukan <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -M:    Matan Barak <[email protected]>
 -M:    Leon Romanovsky <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
 -M:    Leon Romanovsky <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -W:    http://www.melexis.com
 -S:    Supported
 -F:    drivers/iio/temperature/mlx90614.c
 -
 -MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 -M:    Don Brace <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
 +M:    Haojian Zhuang <[email protected]>
 +L:    [email protected] (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 <[email protected]>
@@@ -8952,11 -8959,6 +8952,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 <[email protected]>
  L:    [email protected]
@@@ -8967,6 -8969,11 +8967,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 <[email protected]>
  S:    Maintained
@@@ -9027,8 -9034,12 +9027,8 @@@ 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
+ F:    include/linux/mtd/*nand*.h
  
 -NATSEMI ETHERNET DRIVER (DP8381x)
 -S:    Orphan
 -F:    drivers/net/ethernet/natsemi/natsemi.c
 -
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <[email protected]>
  S:    Maintained
@@@ -9036,10 -9047,6 +9036,10 @@@ L:    [email protected] (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 <[email protected]>
  S:    Odd Fixes
@@@ -9159,35 -9166,6 +9159,35 @@@ S:    Maintaine
  W:    https://fedorahosted.org/dropwatch/
  F:    net/core/drop_monitor.c
  
 +NETWORKING DRIVERS
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Vivien Didelot <[email protected]>
@@@ -9219,6 -9197,28 +9219,6 @@@ F:     tools/net
  F:    tools/testing/selftests/net/
  F:    lib/random32.c
  
 -NETWORKING [IPv4/IPv6]
 -M:    "David S. Miller" <[email protected]>
 -M:    Alexey Kuznetsov <[email protected]>
 -M:    Hideaki YOSHIFUJI <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -M:    Aviad Yehezkel <[email protected]>
 -M:    Dave Watson <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    net/tls/*
 -F:    include/uapi/linux/tls.h
 -F:    include/net/tls.h
 -
  NETWORKING [IPSEC]
  M:    Steffen Klassert <[email protected]>
  M:    Herbert Xu <[email protected]>
@@@ -9243,36 -9243,43 +9243,36 @@@ F:   net/ipv6/ip6_vti.
  F:    include/uapi/linux/xfrm.h
  F:    include/net/xfrm.h
  
 +NETWORKING [IPv4/IPv6]
 +M:    "David S. Miller" <[email protected]>
 +M:    Alexey Kuznetsov <[email protected]>
 +M:    Hideaki YOSHIFUJI <[email protected]>
 +L:    [email protected]
 +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 [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
  M:    Paul Moore <[email protected]>
  L:    [email protected]
  S:    Maintained
  
 -NETWORKING [WIRELESS]
 -L:    [email protected]
 -Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -
 -NETWORKING DRIVERS
 +NETWORKING [TLS]
 +M:    Ilya Lesokhin <[email protected]>
 +M:    Aviad Yehezkel <[email protected]>
 +M:    Dave Watson <[email protected]>
  L:    [email protected]
 -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 <[email protected]>
 +NETWORKING [WIRELESS]
  L:    [email protected]
  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 <[email protected]>
@@@ -9366,6 -9373,14 +9366,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 <[email protected]>
 -M:    Sakari Ailus <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/media/i2c/et8ek8
 -F:    drivers/media/i2c/ad5820.c
 -
  NOKIA N900 POWER SUPPLY DRIVERS
  R:    Pali Rohár <[email protected]>
  F:    include/linux/power/bq2415x_charger.h
@@@ -9377,12 -9392,6 +9377,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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/ntb/hw/amd/
 +
  NTB DRIVER CORE
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
@@@ -9412,6 -9421,12 +9412,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 <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/ntb/hw/amd/
 -
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <[email protected]>
  L:    [email protected]
@@@ -9441,6 -9456,15 +9441,6 @@@ F:     drivers/nvme/host
  F:    include/linux/nvme.h
  F:    include/uapi/linux/nvme_ioctl.h
  
 -NVM EXPRESS TARGET DRIVER
 -M:    Christoph Hellwig <[email protected]>
 -M:    Sagi Grimberg <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -9451,15 -9475,6 +9451,15 @@@ F:    drivers/nvme/host/fc.
  F:    drivers/nvme/target/fc.c
  F:    drivers/nvme/target/fcloop.c
  
 +NVM EXPRESS TARGET DRIVER
 +M:    Christoph Hellwig <[email protected]>
 +M:    Sagi Grimberg <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  S:    Maintained
@@@ -9468,6 -9483,13 +9468,6 @@@ F:     Documentation/devicetree/bindings/nv
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 -NXP-NCI NFC DRIVER
 -M:    Clément Perrochaud <[email protected]>
 -R:    Charles Gorand <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/nfc/nxp-nci
 -
  NXP TDA998X DRM DRIVER
  M:    Russell King <[email protected]>
  S:    Supported
@@@ -9482,31 -9504,55 +9482,31 @@@ L:   [email protected] (moderat
  S:    Maintained
  F:    sound/soc/codecs/tfa9879*
  
 +NXP-NCI NFC DRIVER
 +M:    Clément Perrochaud <[email protected]>
 +R:    Charles Gorand <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/nxp-nci
 +
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  S:    Supported
  F:    tools/objtool/
  
 -OMAP1 SUPPORT
 -M:    Aaro Koskinen <[email protected]>
 -M:    Tony Lindgren <[email protected]>
 +OMAP AUDIO SUPPORT
 +M:    Peter Ujfalusi <[email protected]>
 +M:    Jarkko Nikula <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
 -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:    [email protected]
 -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 <[email protected]>
@@@ -9520,20 -9566,33 +9520,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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    arch/arm/*omap*/*clock*
 -
 -OMAP POWER MANAGEMENT SUPPORT
 -M:    Kevin Hilman <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    arch/arm/*omap*/*pm*
 -F:    drivers/cpufreq/omap-cpufreq.c
 -
 -OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -M:    Rajendra Nayak <[email protected]>
 -M:    Paul Walmsley <[email protected]>
 +OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 +M:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
 -F:    arch/arm/mach-omap2/prm*
 +F:    drivers/video/fbdev/omap2/
 +F:    Documentation/arm/OMAP/DSS
  
 -OMAP AUDIO SUPPORT
 -M:    Peter Ujfalusi <[email protected]>
 -M:    Jarkko Nikula <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +OMAP FRAMEBUFFER SUPPORT
 +M:    Tomi Valkeinen <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    sound/soc/omap/
 +F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
  M:    Roger Quadros <[email protected]>
@@@ -9543,14 -9602,20 +9543,14 @@@ S:   Maintaine
  F:    drivers/memory/omap-gpmc.c
  F:    arch/arm/mach-omap2/*gpmc*
  
 -OMAP FRAMEBUFFER SUPPORT
 -M:    Tomi Valkeinen <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/video/fbdev/omap/
 -
 -OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 -M:    Tomi Valkeinen <[email protected]>
 +OMAP GPIO DRIVER
 +M:    Grygorii Strashko <[email protected]>
 +M:    Santosh Shilimkar <[email protected]>
 +M:    Kevin Hilman <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  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 <[email protected]>
  S:    Maintained
  F:    drivers/hwspinlock/omap_hwspinlock.c
  
 -OMAP MMC SUPPORT
 -M:    Jarkko Lavinen <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/mmc/host/omap.c
 -
  OMAP HS MMC SUPPORT
  L:    [email protected]
  L:    [email protected]
  S:    Orphan
  F:    drivers/mmc/host/omap_hsmmc.c
  
 -OMAP RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    drivers/char/hw_random/omap-rng.c
 -
 -OMAP HWMOD SUPPORT
 -M:    Benoît Cousson <[email protected]>
 -M:    Paul Walmsley <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    arch/arm/mach-omap2/omap_hwmod.*
 -
  OMAP HWMOD DATA
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  
 +OMAP HWMOD SUPPORT
 +M:    Benoît Cousson <[email protected]>
 +M:    Paul Walmsley <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/mach-omap2/omap_hwmod.*
 +
  OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -9591,31 -9667,6 +9591,31 @@@ F:    Documentation/devicetree/bindings/me
  F:    drivers/media/platform/omap3isp/
  F:    drivers/staging/media/omap4iss/
  
 +OMAP MMC SUPPORT
 +M:    Jarkko Lavinen <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/omap.c
 +
 +OMAP POWER MANAGEMENT SUPPORT
 +M:    Kevin Hilman <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/*omap*/*pm*
 +F:    drivers/cpufreq/omap-cpufreq.c
 +
 +OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 +M:    Rajendra Nayak <[email protected]>
 +M:    Paul Walmsley <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/mach-omap2/prm*
 +
 +OMAP RANDOM NUMBER GENERATOR SUPPORT
 +M:    Deepak Saxena <[email protected]>
 +S:    Maintained
 +F:    drivers/char/hw_random/omap-rng.c
 +
  OMAP USB SUPPORT
  L:    [email protected]
  L:    [email protected]
@@@ -9623,56 -9674,20 +9623,56 @@@ S:   Orpha
  F:    drivers/usb/*/*omap*
  F:    arch/arm/*omap*/usb*
  
 -OMAP GPIO DRIVER
 -M:    Grygorii Strashko <[email protected]>
 -M:    Santosh Shilimkar <[email protected]>
 -M:    Kevin Hilman <[email protected]>
 +OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
 +M:    Mark Jackson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/boot/dts/am335x-nano.dts
 +
 +OMAP1 SUPPORT
 +M:    Aaro Koskinen <[email protected]>
 +M:    Tony Lindgren <[email protected]>
  L:    [email protected]
 +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:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
 -F:    drivers/gpio/gpio-omap.c
 +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
  
 -OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
 -M:    Mark Jackson <[email protected]>
 +OMAP2+ SUPPORT
 +M:    Tony Lindgren <[email protected]>
  L:    [email protected]
 +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/boot/dts/am335x-nano.dts
 +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 <[email protected]>
@@@ -9693,13 -9708,6 +9693,13 @@@ M:    Harald Welte <[email protected]
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OV13858 SENSOR DRIVER
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov13858.c
 +
  OMNIVISION OV5640 SENSOR DRIVER
  M:    Steve Longerbeam <[email protected]>
  L:    [email protected]
@@@ -9722,6 -9730,13 +9722,6 @@@ S:     Maintaine
  F:    drivers/media/i2c/ov7670.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
 -OMNIVISION OV13858 SENSOR DRIVER
 -M:    Sakari Ailus <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/i2c/ov13858.c
 -
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
@@@ -9739,26 -9754,12 +9739,26 @@@ F:   drivers/scsi/osst.
  F:    drivers/scsi/osst_*.h
  F:    drivers/scsi/st.h
  
 -OPENCORES I2C BUS DRIVER
 -M:    Peter Korsgaard <[email protected]>
 -L:    [email protected]
 +OP-TEE DRIVER
 +M:    Jens Wiklander <[email protected]>
  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 <[email protected]>
 +M:    Niranjana Vishwanathapura <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/ulp/opa_vnic
 +
 +OPEN FIRMWARE AND DEVICE TREE OVERLAYS
 +M:    Pantelis Antoniou <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -9783,12 -9784,14 +9783,12 @@@ F:   Documentation/devicetree
  F:    arch/*/boot/dts/
  F:    include/dt-bindings/
  
 -OPEN FIRMWARE AND DEVICE TREE OVERLAYS
 -M:    Pantelis Antoniou <[email protected]>
 -L:    devicetree@vger.kernel.org
 +OPENCORES I2C BUS DRIVER
 +M:    Peter Korsgaard <[email protected]>
 +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 <[email protected]>
@@@ -9837,6 -9840,11 +9837,6 @@@ F:     arch/*/oprofile
  F:    drivers/oprofile/
  F:    include/linux/oprofile.h
  
 -OP-TEE DRIVER
 -M:    Jens Wiklander <[email protected]>
 -S:    Maintained
 -F:    drivers/tee/optee/
 -
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
  M:    Mark Fasheh <[email protected]>
  M:    Joel Becker <[email protected]>
@@@ -9847,14 -9855,6 +9847,14 @@@ F:    Documentation/filesystems/ocfs2.tx
  F:    Documentation/filesystems/dlmfs.txt
  F:    fs/ocfs2/
  
 +ORANGEFS FILESYSTEM
 +M:    Mike Marshall <[email protected]>
 +L:    [email protected] (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:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/orinoco
@@@ -9869,16 -9869,6 +9869,16 @@@ F:    drivers/scsi/osd
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
 +OV2659 OMNIVISION SENSOR DRIVER
 +M:    "Lad, Prabhakar" <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -9887,6 -9877,14 +9887,6 @@@ S:     Supporte
  F:    fs/overlayfs/
  F:    Documentation/filesystems/overlayfs.txt
  
 -ORANGEFS FILESYSTEM
 -M:    Mike Marshall <[email protected]>
 -L:    [email protected] (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 <[email protected]>
  L:    [email protected]
@@@ -9927,11 -9925,11 +9927,11 @@@ F:   Documentation/mn10300
  F:    arch/mn10300/
  
  PARALLEL LCD/KEYPAD PANEL DRIVER
 -M:      Willy Tarreau <[email protected]>
 -M:      Ksenija Stanojevic <[email protected]>
 -S:      Odd Fixes
 -F:      Documentation/misc-devices/lcd-panel-cgram.txt
 -F:      drivers/misc/panel.c
 +M:    Willy Tarreau <[email protected]>
 +M:    Ksenija Stanojevic <[email protected]>
 +S:    Odd Fixes
 +F:    Documentation/misc-devices/lcd-panel-cgram.txt
 +F:    drivers/misc/panel.c
  
  PARALLEL PORT SUBSYSTEM
  M:    Sudip Mukherjee <[email protected]>
@@@ -10027,13 -10025,42 +10027,13 @@@ M:        Khalid Aziz <[email protected]
  S:    Maintained
  F:    drivers/firmware/pcdp.*
  
 -PCI ERROR RECOVERY
 -M:    Linas Vepstas <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/PCI/pci-error-recovery.txt
 -
 -PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 -M:    Russell Currey <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 +PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
 +M:    Thomas Petazzoni <[email protected]>
  L:    [email protected]
 -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:    [email protected] (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 <[email protected]>
@@@ -10043,14 -10070,6 +10043,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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -10067,6 -10086,14 +10067,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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
  M:    Mingkai Hu <[email protected]>
  S:    Maintained
  F:    drivers/pci/dwc/*layerscape*
  
 +PCI DRIVER FOR GENERIC OF HOSTS
 +M:    Will Deacon <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (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 <[email protected]>
  M:    Lucas Stach <[email protected]>
@@@ -10095,11 -10113,28 +10095,11 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
  F:    drivers/pci/dwc/*imx6*
  
 -PCI DRIVER FOR TI KEYSTONE
 -M:    Murali Karicheri <[email protected]>
 -L:    [email protected]
 -L:    [email protected] (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 <[email protected]>
 -M:    Jason Cooper <[email protected]>
 -L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    drivers/pci/host/*mvebu*
 -
 -PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
 -M:    Thomas Petazzoni <[email protected]>
 +PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 +M:    Keith Busch <[email protected]>
  L:    [email protected]
 -L:    [email protected] (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 <[email protected]>
@@@ -10112,14 -10147,6 +10112,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 <[email protected]>
 +M:    Jason Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*mvebu*
 +
  PCI DRIVER FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
  L:    [email protected]
@@@ -10128,6 -10155,14 +10128,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 <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -10151,44 -10186,26 +10151,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 <[email protected]>
 +PCI DRIVER FOR TI DRA7XX
 +M:    Kishon Vijay Abraham I <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  L:    [email protected] (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 ENDPOINT SUBSYSTEM
 +M:    Kishon Vijay Abraham I <[email protected]>
 +L:    [email protected]
 +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/
  
 -PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 -M:    Keith Busch <[email protected]>
 -L:    linux[email protected].org
 +PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 +M:    Russell Currey <[email protected]>
 +L:    linux[email protected].org
  S:    Supported
 -F:    drivers/pci/host/vmd.c
 +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
  
 -PCIE DRIVER FOR ST SPEAR13XX
 -M:    Pratyush Anand <pratyush.anand@gmail.com>
 +PCI ERROR RECOVERY
 +M:    Linas Vepstas <linasvepstas@gmail.com>
  L:    [email protected]
 -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 <[email protected]>
@@@ -10206,19 -10223,6 +10206,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Jesper Nilsson <[email protected]>
@@@ -10228,14 -10232,6 +10228,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/axis,artpec*
  F:    drivers/pci/dwc/*artpec*
  
 +PCIE DRIVER FOR CAVIUM THUNDERX
 +M:    David Daney <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (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 <[email protected]>
  M:    Gabriele Paoloni <[email protected]>
@@@ -10252,21 -10248,6 +10252,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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/mediatek*
 +F:    drivers/pci/host/*mediatek*
 +
 +PCIE DRIVER FOR QUALCOMM MSM
 +M:    Stanimir Varbanov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pci/dwc/*qcom*
 +
  PCIE DRIVER FOR ROCKCHIP
  M:    Shawn Lin <[email protected]>
  L:    [email protected]
@@@ -10275,11 -10256,28 +10275,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 <[email protected]>
 -L:     [email protected]
 -L:     [email protected]
 -S:     Maintained
 -F:     drivers/pci/dwc/*qcom*
 -
 -PCIE DRIVER FOR CAVIUM THUNDERX
 -M:    David Daney <[email protected]>
 +PCIE DRIVER FOR ST SPEAR13XX
 +M:    Pratyush Anand <[email protected]>
  L:    [email protected]
 -L:    [email protected] (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 <[email protected]>
 -L:      [email protected]
 -L:      [email protected]
 -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
  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/
  
@@@ -10448,14 -10446,14 +10448,14 @@@ S:        Maintaine
  F:    drivers/pinctrl/spear/
  
  PISTACHIO SOC SUPPORT
 -M:      James Hartley <[email protected]>
 -M:      Ionela Voinescu <[email protected]>
 -L:      [email protected]
 -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 <[email protected]>
 +M:    Ionela Voinescu <[email protected]>
 +L:    [email protected]
 +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
  S:    Supported
  F:    drivers/scsi/pm8001/
  
 +PNP SUPPORT
 +M:    "Rafael J. Wysocki" <[email protected]>
 +S:    Maintained
 +F:    drivers/pnp/
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
@@@ -10524,6 -10517,15 +10524,6 @@@ F:  include/linux/pm_
  F:    include/linux/powercap.h
  F:    drivers/powercap/
  
 -POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Sebastian Reichel <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  M:    Lorenzo Pieralisi <[email protected]>
@@@ -10533,21 -10535,23 +10533,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/char/powernv-op-panel.c
  
 -PNP SUPPORT
 -M:    "Rafael J. Wysocki" <[email protected]>
 -S:    Maintained
 -F:    drivers/pnp/
 -
 -PPP PROTOCOL DRIVERS AND COMPRESSORS
 -M:    Paul Mackerras <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ppp/ppp_*
 -
  PPP OVER ATM (RFC 2364)
  M:    Mitchell Blank Jr <[email protected]>
  S:    Maintained
@@@ -10567,12 -10571,6 +10567,12 @@@ 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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ppp/ppp_*
 +
  PPS SUPPORT
  M:    Rodolfo Giometti <[email protected]>
  W:    http://wiki.enneenne.com/index.php/LinuxPPS_support
@@@ -10686,6 -10684,7 +10686,6 @@@ F:   drivers/ptp/
  F:    include/linux/ptp_cl*
  
  PTRACE SUPPORT
 -M:    Roland McGrath <[email protected]>
  M:    Oleg Nesterov <[email protected]>
  S:    Maintained
  F:    include/asm-generic/syscall.h
@@@ -10693,12 -10692,7 +10693,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 <[email protected]>
@@@ -10747,20 -10741,6 +10747,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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-pxa.c
 +
 +PXA MMCI DRIVER
 +S:    Orphan
 +
 +PXA RTC DRIVER
 +M:    Robert Jarzmik <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +
  PXA2xx/PXA3xx SUPPORT
  M:    Daniel Mack <[email protected]>
  M:    Haojian Zhuang <[email protected]>
@@@ -10780,12 -10760,36 +10780,12 @@@ F:        include/sound/pxa2xx-lib.
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
 -PXA GPIO DRIVER
 -M:    Robert Jarzmik <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/gpio/gpio-pxa.c
 -
  PXA3xx NAND FLASH DRIVER
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/nand/pxa3xx_nand.c
  
 -MMP SUPPORT
 -M:    Eric Miao <[email protected]>
 -M:    Haojian Zhuang <[email protected]>
 -L:    [email protected] (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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -
  QAT DRIVER
  M:    Giovanni Cabiddu <[email protected]>
  M:    Salvatore Benedetto <[email protected]>
@@@ -10793,56 -10797,12 +10793,56 @@@ L:        [email protected]
  S:    Supported
  F:    drivers/crypto/qat/
  
 +QCOM AUDIO (ASoC) DRIVERS
 +M:    Patrick Lai <[email protected]>
 +M:    Banajit Goswami <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/soc/qcom/
 +
 +QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 +M:    Gabriel Somlo <[email protected]>
 +M:    "Michael S. Tsirkin" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qemu_fw_cfg.c
 +
  QIB DRIVER
  M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qib/
  
 +QLOGIC QL41xxx FCOE DRIVER
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/qedf/
 +
 +QLOGIC QL41xxx ISCSI DRIVER
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/qedi/
 +
 +QLOGIC QL4xxx ETHERNET DRIVER
 +M:    Yuval Mintz <[email protected]>
 +M:    Ariel Elior <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Ariel Elior <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/hw/qedr/
 +F:    include/uapi/rdma/qedr-abi.h
 +
  QLOGIC QLA1280 SCSI DRIVER
  M:    Michael Reed <[email protected]>
  L:    [email protected]
@@@ -10856,6 -10816,13 +10856,6 @@@ S:  Supporte
  F:    Documentation/scsi/LICENSE.qla2xxx
  F:    drivers/scsi/qla2xxx/
  
 -QLOGIC QLA4XXX iSCSI DRIVER
 -M:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/scsi/LICENSE.qla4xxx
 -F:    drivers/scsi/qla4xxx/
 -
  QLOGIC QLA3XXX NETWORK DRIVER
  M:    [email protected]
  L:    [email protected]
@@@ -10863,13 -10830,6 +10863,13 @@@ S: Supporte
  F:    Documentation/networking/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
 +QLOGIC QLA4XXX iSCSI DRIVER
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/scsi/LICENSE.qla4xxx
 +F:    drivers/scsi/qla4xxx/
 +
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
  M:    Harish Patil <[email protected]>
  M:    Manish Chopra <[email protected]>
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlge/
  
 -QLOGIC QL4xxx ETHERNET DRIVER
 -M:    Yuval Mintz <[email protected]>
 -M:    Ariel Elior <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/net/ethernet/qlogic/qed/
 -F:    include/linux/qed/
 -F:    drivers/net/ethernet/qlogic/qede/
 -
 -QLOGIC QL41xxx ISCSI DRIVER
 -M:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/scsi/qedi/
 -
 -QLOGIC QL41xxx FCOE DRIVER
 -M:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/scsi/qedf/
 -
  QNX4 FILESYSTEM
  M:    Anders Larsen <[email protected]>
  W:    http://www.alarsen.net/linux/qnx4fs/
@@@ -10912,6 -10894,13 +10912,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 <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -10920,13 -10909,6 +10920,13 @@@ 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 <[email protected]>
 +L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 +S:    Supported
 +F:    drivers/net/wireless/ath/ath9k/
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -10956,24 -10938,33 +10956,24 @@@ T:        git git://github.com/KrasnikovEugene
  S:    Supported
  F:    drivers/net/wireless/ath/wcn36xx/
  
 -QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 -M:    Gabriel Somlo <[email protected]>
 -M:    "Michael S. Tsirkin" <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/firmware/qemu_fw_cfg.c
 -
  QUANTENNA QTNFMAC WIRELESS DRIVER
 -M:   Igor Mitsyanko <[email protected]>
 -M:   Avinash Patil <[email protected]>
 -M:   Sergey Matyukevich <[email protected]>
 -S:   Maintained
 -F:   drivers/net/wireless/quantenna
 +M:    Igor Mitsyanko <[email protected]>
 +M:    Avinash Patil <[email protected]>
 +M:    Sergey Matyukevich <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wireless/quantenna
  
 -RADOS BLOCK DEVICE (RBD)
 -M:    Ilya Dryomov <[email protected]>
 -M:    Sage Weil <[email protected]>
 -M:    Alex Elder <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 +M:    Christian König <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -10997,19 -10988,6 +10997,19 @@@ S: Maintaine
  F:    drivers/media/radio/radio-shark2.c
  F:    drivers/media/radio/radio-tea5777.c
  
 +RADOS BLOCK DEVICE (RBD)
 +M:    Ilya Dryomov <[email protected]>
 +M:    Sage Weil <[email protected]>
 +M:    Alex Elder <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/rdc/r6040.c
  
 +RDMAVT - RDMA verbs software
 +M:    Dennis Dalessandro <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/sw/rdmavt
 +
  RDS - RELIABLE DATAGRAM SOCKETS
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected]
@@@ -11105,6 -11077,12 +11105,6 @@@ S:  Supporte
  F:    net/rds/
  F:    Documentation/networking/rds.txt
  
 -RDMAVT - RDMA verbs software
 -M:    Dennis Dalessandro <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/infiniband/sw/rdmavt
 -
  RDT - RESOURCE ALLOCATION
  M:    Fenghua Yu <[email protected]>
  L:    [email protected]
@@@ -11153,6 -11131,11 +11153,6 @@@ S:  Maintaine
  F:    sound/soc/codecs/rt*
  F:    include/sound/rt*.h
  
 -REISERFS FILE SYSTEM
 -L:    [email protected]
 -S:    Supported
 -F:    fs/reiserfs/
 -
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <[email protected]>
  L:    [email protected]
@@@ -11162,11 -11145,6 +11162,11 @@@ F: Documentation/devicetree/bindings/re
  F:    drivers/base/regmap/
  F:    include/linux/regmap.h
  
 +REISERFS FILE SYSTEM
 +L:    [email protected]
 +S:    Supported
 +F:    fs/reiserfs/
 +
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
@@@ -11242,16 -11220,16 +11242,16 @@@ S:        Maintaine
  F:    lib/rhashtable.c
  F:    include/linux/rhashtable.h
  
 -RICOH SMARTMEDIA/XD DRIVER
 +RICOH R5C592 MEMORYSTICK DRIVER
  M:    Maxim Levitsky <[email protected]>
  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 <[email protected]>
  S:    Maintained
 -F:    drivers/memstick/host/r592.*
 +F:    drivers/mtd/nand/r852.c
 +F:    drivers/mtd/nand/r852.h
  
  ROCCAT DRIVERS
  M:    Stefan Achatz <[email protected]>
@@@ -11388,23 -11366,6 +11388,23 @@@ S: Supporte
  F:    drivers/s390/block/dasd*
  F:    block/partitions/ibm.c
  
 +S390 IOMMU (PCI)
 +M:    Gerald Schaefer <[email protected]>
 +L:    [email protected]
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    drivers/iommu/s390-iommu.c
 +
 +S390 IUCV NETWORK LAYER
 +M:    Julian Wiedmann <[email protected]>
 +M:    Ursula Braun <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Ursula Braun <[email protected]>
@@@ -11422,16 -11383,6 +11422,16 @@@ S: Supporte
  F:    arch/s390/pci/
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  
 +S390 VFIO-CCW DRIVER
 +M:    Cornelia Huck <[email protected]>
 +M:    Dong Jia Shi <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -11446,6 -11397,33 +11446,6 @@@ W:  http://www.ibm.com/developerworks/li
  S:    Supported
  F:    drivers/s390/scsi/zfcp_*
  
 -S390 IUCV NETWORK LAYER
 -M:    Julian Wiedmann <[email protected]>
 -M:    Ursula Braun <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -W:    http://www.ibm.com/developerworks/linux/linux390/
 -S:    Supported
 -F:    drivers/iommu/s390-iommu.c
 -
 -S390 VFIO-CCW DRIVER
 -M:    Cornelia Huck <[email protected]>
 -M:    Dong Jia Shi <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -11479,6 -11457,12 +11479,6 @@@ F:  drivers/media/common/saa7146
  F:    drivers/media/pci/saa7146/
  F:    include/media/saa7146*
  
 -SAMSUNG LAPTOP DRIVER
 -M:    Corentin Chary <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/samsung-laptop.c
 -
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Sangbeom Kim <[email protected]>
  S:    Maintained
  F:    drivers/video/fbdev/s3c-fb.c
  
 +SAMSUNG LAPTOP DRIVER
 +M:    Corentin Chary <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/samsung-laptop.c
 +
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Sangbeom Kim <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
@@@ -11525,6 -11503,22 +11525,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 <[email protected]>
 -M:    Vladimir Zapolskiy <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/crypto/s5p-sss.c
 -
 -SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 -M:    Kyungmin Park <[email protected]>
 -M:    Sylwester Nawrocki <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
@@@ -11533,6 -11527,20 +11533,6 @@@ S:  Maintaine
  F:    drivers/media/platform/s3c-camif/
  F:    include/media/drv-intf/s3c_camif.h
  
 -SAMSUNG S5C73M3 CAMERA DRIVER
 -M:    Kyungmin Park <[email protected]>
 -M:    Andrzej Hajda <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/media/i2c/s5c73m3/*
 -
 -SAMSUNG S5K5BAF CAMERA DRIVER
 -M:    Kyungmin Park <[email protected]>
 -M:    Andrzej Hajda <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/media/i2c/s5k5baf.c
 -
  SAMSUNG S3FWRN5 NFC DRIVER
  M:    Robert Baldyga <[email protected]>
  M:    Krzysztof Opasiak <[email protected]>
@@@ -11540,86 -11548,176 +11540,86 @@@ L:       [email protected] (moderated fo
  S:    Supported
  F:    drivers/nfc/s3fwrn5
  
 -SAMSUNG SOC CLOCK DRIVERS
 -M:    Sylwester Nawrocki <[email protected]>
 -M:    Tomasz Figa <[email protected]>
 -M:    Chanwoo Choi <[email protected]>
 -S:    Supported
 -L:    [email protected] (moderated for non-subscribers)
 -F:    drivers/clk/samsung/
 -F:    include/dt-bindings/clock/exynos*.h
 -F:    Documentation/devicetree/bindings/clock/exynos*.txt
 -
 -SAMSUNG SPI DRIVERS
 -M:    Kukjin Kim <[email protected]>
 -M:    Krzysztof Kozlowski <[email protected]>
 -M:    Andi Shyti <[email protected]>
 -L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 -F:    drivers/spi/spi-s3c*
 -F:    include/linux/platform_data/spi-s3c64xx.h
 -
 -SAMSUNG SXGBE DRIVERS
 -M:    Byungho An <[email protected]>
 -M:    Girish K S <[email protected]>
 -M:    Vipul Pandya <[email protected]>
 -S:    Supported
 -L:    [email protected]
 -F:    drivers/net/ethernet/samsung/sxgbe/
 -
 -SAMSUNG THERMAL DRIVER
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 -F:    drivers/thermal/samsung/
 -
 -SAMSUNG USB2 PHY DRIVER
 -M:    Kamil Debski <[email protected]>
 -M:    Sylwester Nawrocki <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/serial/
 -F:    drivers/tty/serial/
 -
 -SERIAL DEVICE BUS
 -M:    Rob Herring <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 +SAMSUNG S5C73M3 CAMERA DRIVER
 +M:    Kyungmin Park <[email protected]>
 +M:    Andrzej Hajda <[email protected]>
  L:    [email protected]
 -S:    Maintained
 -F:    drivers/media/rc/serial_ir.c
 -
 -STI CEC DRIVER
 -M:    Benjamin Gaignard <[email protected]>
 -S:    Maintained
 -F:    drivers/staging/media/st-cec/
 -F:    Documentation/devicetree/bindings/media/stih-cec.txt
 -
 -SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 -M:    Ursula Braun <[email protected]>
 -L:    [email protected]
 -W:    http://www.ibm.com/developerworks/linux/linux390/
 -S:    Supported
 -F:    net/smc/
 -
 -SYNOPSYS DESIGNWARE DMAC DRIVER
 -M:    Viresh Kumar <[email protected]>
 -M:    Andy Shevchenko <[email protected]>
 -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 <[email protected]>
 -L:    [email protected]
  S:    Supported
 -F:    drivers/net/ethernet/synopsys/
 +F:    drivers/media/i2c/s5c73m3/*
  
 -SYNOPSYS DESIGNWARE I2C DRIVER
 -M:    Jarkko Nikula <[email protected]>
 -R:    Andy Shevchenko <[email protected]>
 -R:    Mika Westerberg <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/i2c/busses/i2c-designware-*
 -F:    include/linux/platform_data/i2c-designware.h
 +SAMSUNG S5K5BAF CAMERA DRIVER
 +M:    Kyungmin Park <[email protected]>
 +M:    Andrzej Hajda <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/media/i2c/s5k5baf.c
  
 -SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 -M:    Jaehoon Chung <[email protected]>
 -L:    [email protected]
 +SAMSUNG S5P Security SubSystem (SSS) DRIVER
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Vladimir Zapolskiy <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/mmc/host/dw_mmc*
 +F:    drivers/crypto/s5p-sss.c
  
 -SYSTEM TRACE MODULE CLASS
 -M:    Alexander Shishkin <[email protected]>
 -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
 +SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 +M:    Kyungmin Park <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
 +L:    [email protected]
 +Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Supported
 +F:    drivers/media/platform/exynos4-is/
  
 -TEE SUBSYSTEM
 -M:    Jens Wiklander <[email protected]>
 -S:    Maintained
 -F:    include/linux/tee_drv.h
 -F:    include/uapi/linux/tee.h
 -F:    drivers/tee/
 -F:    Documentation/tee.txt
 +SAMSUNG SOC CLOCK DRIVERS
 +M:    Sylwester Nawrocki <[email protected]>
 +M:    Tomasz Figa <[email protected]>
 +M:    Chanwoo Choi <[email protected]>
 +S:    Supported
 +L:    [email protected] (moderated for non-subscribers)
 +F:    drivers/clk/samsung/
 +F:    include/dt-bindings/clock/exynos*.h
 +F:    Documentation/devicetree/bindings/clock/exynos*.txt
  
 -THUNDERBOLT DRIVER
 -M:    Andreas Noever <[email protected]>
 -M:    Michael Jamet <[email protected]>
 -M:    Mika Westerberg <[email protected]>
 -M:    Yehezkel Bernat <[email protected]>
 +SAMSUNG SPI DRIVERS
 +M:    Kukjin Kim <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Andi Shyti <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/thunderbolt/
 +F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 +F:    drivers/spi/spi-s3c*
 +F:    include/linux/platform_data/spi-s3c64xx.h
  
 -TI BQ27XXX POWER SUPPLY DRIVER
 -R:    Andrew F. Davis <[email protected]>
 -F:    include/linux/power/bq27xxx_battery.h
 -F:    drivers/power/supply/bq27xxx_battery.c
 -F:    drivers/power/supply/bq27xxx_battery_i2c.c
 +SAMSUNG SXGBE DRIVERS
 +M:    Byungho An <[email protected]>
 +M:    Girish K S <[email protected]>
 +M:    Vipul Pandya <[email protected]>
 +S:    Supported
 +L:    [email protected]
 +F:    drivers/net/ethernet/samsung/sxgbe/
  
 -TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 -M:    John Stultz <[email protected]>
 -M:    Thomas Gleixner <[email protected]>
 -R:    Stephen Boyd <[email protected]>
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +SAMSUNG THERMAL DRIVER
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
  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/
 +T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 +F:    drivers/thermal/samsung/
  
 -TI TRF7970A NFC DRIVER
 -M:    Mark Greer <[email protected]>
 -L:    [email protected]
 -L:    linux-[email protected] (moderated for non-subscribers)
 +SAMSUNG USB2 PHY DRIVER
 +M:    Kamil Debski <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
 +L:    linux-[email protected]
  S:    Supported
 -F:    drivers/nfc/trf7970a.c
 -F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
 +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 <[email protected]>
@@@ -11649,6 -11747,16 +11649,6 @@@ M:  Lubomir Rintel <[email protected]
  S:    Supported
  F:    drivers/char/pcmcia/scr24x_cs.c
  
 -SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
 -M:    Sudeep Holla <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdricoh_cs.c
  
 -SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -M:    Adrian Hunter <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  R:    Andy Lutomirski <[email protected]>
  S:    Maintained
  F:    drivers/mmc/host/sdhci-brcmstb*
  
 +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 +M:    Adrian Hunter <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Jaehoon Chung <[email protected]>
@@@ -11787,10 -11895,6 +11787,10 @@@ F: block/opal_proto.
  F:    include/linux/sed*
  F:    include/uapi/linux/sed*
  
 +SECURITY CONTACT
 +M:    Security Officers <[email protected]>
 +S:    Supported
 +
  SECURITY SUBSYSTEM
  M:    James Morris <[email protected]>
  M:    "Serge E. Hallyn" <[email protected]>
@@@ -11800,6 -11904,10 +11800,6 @@@ W:  http://kernsec.org
  S:    Supported
  F:    security/
  
 -SECURITY CONTACT
 -M:    Security Officers <[email protected]>
 -S:    Supported
 -
  SELINUX SECURITY MODULE
  M:    Paul Moore <[email protected]>
  M:    Stephen Smalley <[email protected]>
@@@ -11813,32 -11921,62 +11813,32 @@@ F:        security/selinux
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
  
 -APPARMOR SECURITY MODULE
 -M:    John Johansen <[email protected]>
 -L:    [email protected] (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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
  S:    Maintained
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 -Emulex 10Gbps iSCSI - OneConnect DRIVER
 -M:    Subbu Seetharaman <[email protected]>
 -M:    Ketan Mukadam <[email protected]>
 -M:    Jitendra Bhivare <[email protected]>
 -L:    [email protected]
 -W:    http://www.broadcom.com
 -S:    Supported
 -F:    drivers/scsi/be2iscsi/
 +SERIAL DEVICE BUS
 +M:    Rob Herring <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 -M:    Ajit Khaparde <[email protected]>
 -M:    Sriharsha Basavapatna <[email protected]>
 -M:    Somnath Kotur <[email protected]>
 -L:    [email protected]
 -W:    http://www.emulex.com
 -S:    Supported
 -F:    drivers/net/ethernet/emulex/benet/
 +SERIAL DRIVERS
 +M:    Greg Kroah-Hartman <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/serial/
 +F:    drivers/tty/serial/
  
 -EMULEX ONECONNECT ROCE DRIVER
 -M:    Selvin Xavier <[email protected]>
 -M:    Devesh Sharma <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/serial_ir.c
  
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <[email protected]>
@@@ -11867,24 -12005,6 +11867,24 @@@ M: Robin Holt <[email protected]
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
 +SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 +M:    Ursula Braun <[email protected]>
 +L:    [email protected]
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    net/smc/
 +
 +SH_VEU V4L2 MEM2MEM DRIVER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/media/platform/sh_veu.c
 +
 +SH_VOU V4L2 OUTPUT DRIVER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/media/platform/sh_vou.c
 +F:    include/media/drv-intf/sh_vou.h
 +
  SI2157 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -11967,14 -12087,24 +11967,14 @@@ S:        Maintaine
  F:    drivers/input/touchscreen/silead.c
  F:    drivers/platform/x86/silead_dmi.c
  
 -SIMPLEFB FB DRIVER
 -M:    Hans de Goede <[email protected]>
 +SILICON MOTION SM712 FRAME BUFFER DRIVER
 +M:    Sudip Mukherjee <[email protected]>
 +M:    Teddy Wang <[email protected]>
 +M:    Sudip Mukherjee <[email protected]>
  L:    [email protected]
  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:    [email protected]
 -S:    Orphan
 -F:    drivers/media/platform/sh_veu.c
 -
 -SH_VOU V4L2 OUTPUT DRIVER
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/media/platform/sh_vou.c
 -F:    include/media/drv-intf/sh_vou.h
 +F:    drivers/video/fbdev/sm712*
 +F:    Documentation/fb/sm712fb.txt
  
  SIMPLE FIRMWARE INTERFACE (SFI)
  M:    Len Brown <[email protected]>
@@@ -11986,14 -12116,6 +11986,14 @@@ F: arch/x86/platform/sfi
  F:    drivers/sfi/
  F:    include/linux/sfi*.h
  
 +SIMPLEFB FB DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -12018,6 -12140,61 +12018,6 @@@ F:  lib/siphash.
  F:    lib/test_siphash.c
  F:    include/linux/siphash.h
  
 -TI DAVINCI MACHINE SUPPORT
 -M:    Sekhar Nori <[email protected]>
 -M:    Kevin Hilman <[email protected]>
 -L:    [email protected] (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" <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/gpio-davinci.txt
 -F:    drivers/gpio/gpio-davinci.c
 -
 -TI AM437X VPFE DRIVER
 -M:    "Lad, Prabhakar" <[email protected]>
 -L:    [email protected]
 -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" <[email protected]>
 -L:    [email protected]
 -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
 -
 -SILICON MOTION SM712 FRAME BUFFER DRIVER
 -M:    Sudip Mukherjee <[email protected]>
 -M:    Teddy Wang <[email protected]>
 -M:    Sudip Mukherjee <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/video/fbdev/sm712*
 -F:    Documentation/fb/sm712fb.txt
 -
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
@@@ -12078,6 -12255,14 +12078,6 @@@ S:  Maintaine
  F:    Documentation/admin-guide/LSM/Smack.rst
  F:    security/smack/
  
 -DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 -M:    Kevin Hilman <[email protected]>
 -M:    Nishanth Menon <[email protected]>
 -S:    Maintained
 -F:    drivers/power/avs/
 -F:    include/linux/power/smartreflex.h
 -L:    [email protected]
 -
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <[email protected]>
  S:    Odd Fixes
@@@ -12115,12 -12300,6 +12115,12 @@@ S: Supporte
  F:    Documentation/hwmon/sch5627
  F:    drivers/hwmon/sch5627.c
  
 +SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 +M:    Steve Glendinning <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/video/fbdev/smscufx.c
 +
  SMSC47B397 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/smsc/smsc9420.*
  
 -SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 -M:    Steve Glendinning <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/video/fbdev/smscufx.c
 -
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <[email protected]>
  L:    [email protected]
@@@ -12155,15 -12340,6 +12155,15 @@@ M: Chris Boot <[email protected]
  S:    Maintained
  F:    drivers/leds/leds-net48xx.c
  
 +SOFT-ROCE DRIVER (rxe)
 +M:    Moni Shoua <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Anton Sviridenko <[email protected]>
@@@ -12196,6 -12372,16 +12196,6 @@@ S:  Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 -SONY VAIO CONTROL DEVICE DRIVER
 -M:    Mattia Dongili <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  W:    http://tifmxx.berlios.de/
@@@ -12207,16 -12393,6 +12207,16 @@@ M: Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/memstick/core/ms_block.*
  
 +SONY VAIO CONTROL DEVICE DRIVER
 +M:    Mattia Dongili <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Takashi Iwai <[email protected]>
@@@ -12242,13 -12418,6 +12242,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 <[email protected]>
 +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 <[email protected]>
  M:    Mark Brown <[email protected]>
@@@ -12261,6 -12430,13 +12261,6 @@@ F:  Documentation/sound/alsa/soc
  F:    sound/soc/
  F:    include/sound/soc*
  
 -SOUND - DMAENGINE HELPERS
 -M:    Lars-Peter Clausen <[email protected]>
 -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 <[email protected]>
  L:    [email protected]
@@@ -12303,21 -12479,21 +12303,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 <[email protected]>
 -M:    Shiraz Hashim <[email protected]>
  L:    [email protected] (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 <[email protected]>
 +M:    Shiraz Hashim <[email protected]>
  L:    [email protected] (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 <[email protected]>
@@@ -12351,15 -12527,6 +12351,15 @@@ S: Supporte
  F:    Documentation/networking/spider_net.txt
  F:    drivers/net/ethernet/toshiba/spider_net*
  
 +SPMI SUBSYSTEM
 +R:    Stephen Boyd <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
  
 -STAGING SUBSYSTEM
 -M:    Greg Kroah-Hartman <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/staging/
 -
  STAGING - COMEDI
  M:    Ian Abbott <[email protected]>
  M:    H Hartley Sweeten <[email protected]>
@@@ -12477,39 -12651,11 +12477,39 @@@ M:        Arnaud Patard <arnaud.patard@rtp-net
  S:    Odd Fixes
  F:    drivers/staging/xgifb/
  
 +STAGING SUBSYSTEM
 +M:    Greg Kroah-Hartman <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/staging/
 +
  STARFIRE/DURALAN NETWORK DRIVER
  M:    Ion Badulescu <[email protected]>
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STI CEC DRIVER
 +M:    Benjamin Gaignard <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/media/st-cec/
 +F:    Documentation/devicetree/bindings/media/stih-cec.txt
 +
 +STK1160 USB VIDEO CAPTURE DRIVER
 +M:    Ezequiel Garcia <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/stk1160/
 +
 +STMMAC ETHERNET DRIVER
 +M:    Giuseppe Cavallaro <[email protected]>
 +M:    Alexandre Torgue <[email protected]>
 +L:    [email protected]
 +W:    http://www.stlinux.com
 +S:    Supported
 +F:    drivers/net/ethernet/stmicro/stmmac/
 +
  SUN3/3X
  M:    Sam Creasey <[email protected]>
  W:    http://sammy.net/sun3/
@@@ -12581,20 -12727,6 +12581,20 @@@ S: Supporte
  F:    net/switchdev/
  F:    include/net/switchdev.h
  
 +SYNC FILE FRAMEWORK
 +M:    Sumit Semwal <[email protected]>
 +R:    Gustavo Padovan <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -12613,35 -12745,6 +12613,35 @@@ F: arch/arc/plat-axs10
  F:    arch/arc/boot/dts/ax*
  F:    Documentation/devicetree/bindings/arc/axs10*
  
 +SYNOPSYS DESIGNWARE DMAC DRIVER
 +M:    Viresh Kumar <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/synopsys/
 +
 +SYNOPSYS DESIGNWARE I2C DRIVER
 +M:    Jarkko Nikula <[email protected]>
 +R:    Andy Shevchenko <[email protected]>
 +R:    Mika Westerberg <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/dw_mmc*
 +
  SYSTEM CONFIGURATION (SYSCON)
  M:    Lee Jones <[email protected]>
  M:    Arnd Bergmann <[email protected]>
@@@ -12649,16 -12752,6 +12649,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -12667,15 -12760,6 +12667,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/power/reset/
  F:    drivers/power/reset/
  
 +SYSTEM TRACE MODULE CLASS
 +M:    Alexander Shishkin <[email protected]>
 +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 <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    drivers/media/rc/ttusbir.c
  
 +TEE SUBSYSTEM
 +M:    Jens Wiklander <[email protected]>
 +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 <[email protected]>
  M:    Jonathan Hunter <[email protected]>
@@@ -12982,24 -13058,7 +12982,24 @@@ 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 <[email protected]>
 +M:    Michael Jamet <[email protected]>
 +M:    Mika Westerberg <[email protected]>
 +M:    Yehezkel Bernat <[email protected]>
 +S:    Maintained
 +F:    drivers/thunderbolt/
 +
 +TI AM437X VPFE DRIVER
 +M:    "Lad, Prabhakar" <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -13009,11 -13068,13 +13009,11 @@@ L:        [email protected]
  S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
 -TI VPE/CAL DRIVERS
 -M:    Benoit Parrot <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 +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 <[email protected]>
@@@ -13027,33 -13088,6 +13027,33 @@@ S: Maintaine
  F:    drivers/clk/ti/
  F:    include/linux/clk/ti.h
  
 +TI DAVINCI MACHINE SUPPORT
 +M:    Sekhar Nori <[email protected]>
 +M:    Kevin Hilman <[email protected]>
 +L:    [email protected] (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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/gpio-davinci.txt
 +F:    drivers/gpio/gpio-davinci.c
 +
 +TI DAVINCI SERIES MEDIA DRIVER
 +M:    "Lad, Prabhakar" <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -13077,6 -13111,7 +13077,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 <[email protected]>
  M:    Vishwas A Deshpande <[email protected]>
@@@ -13121,28 -13156,12 +13121,28 @@@ L:        [email protected] (moderat
  S:    Odd Fixes
  F:    sound/soc/codecs/tas571x*
  
 +TI TRF7970A NFC DRIVER
 +M:    Mark Greer <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
  
 +TI VPE/CAL DRIVERS
 +M:    Benoit Parrot <[email protected]>
 +L:    [email protected]
 +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:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
@@@ -13152,6 -13171,16 +13152,6 @@@ S:  Orpha
  F:    drivers/net/wireless/ti/
  F:    include/linux/wl12xx.h
  
 -TIPC NETWORK LAYER
 -M:    Jon Maloy <[email protected]>
 -M:    Ying Xue <[email protected]>
 -L:    [email protected] (core kernel code)
 -L:    [email protected] (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 <[email protected]>
  W:    http://www.mellanox.com/repository/solutions/tile-scm/
@@@ -13167,34 -13196,6 +13167,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 <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +R:    Stephen Boyd <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Ying Xue <[email protected]>
 +L:    [email protected] (core kernel code)
 +L:    [email protected] (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 <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -13203,38 -13204,6 +13203,38 @@@ S: Maintaine
  F:    Documentation/networking/tlan.txt
  F:    drivers/net/ethernet/ti/tlan.*
  
 +TM6000 VIDEO4LINUX DRIVER
 +M:    Mauro Carvalho Chehab <[email protected]>
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/tmp401
 +F:    drivers/hwmon/tmp401.c
 +
 +TMPFS (SHMEM FILESYSTEM)
 +M:    Hugh Dickins <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/shmem_fs.h
 +F:    mm/shmem.c
 +
  TOMOYO SECURITY MODULE
  M:    Kentaro Takeda <[email protected]>
  M:    Tetsuo Handa <[email protected]>
  S:    Maintained
  F:    drivers/platform/x86/toshiba_haps.c
  
 -TOSHIBA WMI HOTKEYS DRIVER
 -M:    Azael Avalos <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/toshiba-wmi.c
 -
  TOSHIBA SMM DRIVER
  M:    Jonathan Buzzard <[email protected]>
  W:    http://www.buzzard.org.uk/toshiba/
@@@ -13286,11 -13261,62 +13286,11 @@@ S:        Maintaine
  F:    drivers/media/i2c/tc358743*
  F:    include/media/i2c/tc358743.h
  
 -TMIO/SDHI MMC DRIVER
 -M:    Wolfram Sang <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/hwmon/tmp401
 -F:    drivers/hwmon/tmp401.c
 -
 -TMPFS (SHMEM FILESYSTEM)
 -M:    Hugh Dickins <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    include/linux/shmem_fs.h
 -F:    mm/shmem.c
 -
 -TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
 -M:    Mauro Carvalho Chehab <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -M:    Anton Sviridenko <[email protected]>
 -M:    Andrey Utkin <[email protected]>
 -M:    Andrey Utkin <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/media/pci/tw5864/
 -
 -TW68 VIDEO4LINUX DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +TOSHIBA WMI HOTKEYS DRIVER
 +M:    Azael Avalos <[email protected]>
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/media/pci/tw686x/
 +F:    drivers/platform/x86/toshiba-wmi.c
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
@@@ -13392,31 -13418,6 +13392,31 @@@ S: Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 +TW5864 VIDEO4LINUX DRIVER
 +M:    Bluecherry Maintainers <[email protected]>
 +M:    Anton Sviridenko <[email protected]>
 +M:    Andrey Utkin <[email protected]>
 +M:    Andrey Utkin <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/media/pci/tw5864/
 +
 +TW68 VIDEO4LINUX DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Artem Bityutskiy <[email protected]>
@@@ -13466,13 -13467,6 +13466,13 @@@ S: Maintaine
  F:    drivers/hid/uhid.c
  F:    include/uapi/linux/uhid.h
  
 +ULPI BUS
 +M:    Heikki Krogerus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/common/ulpi.c
 +F:    include/linux/ulpi/
 +
  ULTRA-WIDEBAND (UWB) SUBSYSTEM:
  L:    [email protected]
  S:    Orphan
@@@ -13533,14 -13527,6 +13533,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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/usb/host/uhci*
  
 -USB "USBNET" DRIVER FRAMEWORK
 -M:    Oliver Neukum <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  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 <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
@@@ -13911,37 -13912,6 +13911,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 <[email protected]>
 +M:    Harald Welte <[email protected]>
 +S:    Maintained
 +F:    drivers/mmc/host/via-sdmmc.c
 +
 +VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 +M:    Florian Tobias Schandinat <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/via/via-velocity.*
 +
 +VIDEO MULTIPLEXER DRIVER
 +M:    Philipp Zabel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/platform/video-mux.c
 +
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <[email protected]>
  M:    Marek Szyprowski <[email protected]>
@@@ -13951,20 -13921,11 +13951,20 @@@ S:        Maintaine
  F:    drivers/media/v4l2-core/videobuf2-*
  F:    include/media/videobuf2-*
  
 -VIDEO MULTIPLEXER DRIVER
 -M:    Philipp Zabel <[email protected]>
 +VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 +M:    Helen Koike <[email protected]>
  L:    [email protected]
 +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 <[email protected]>
 +M:    Paolo Bonzini <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    virt/lib/
  
  VIRTIO AND VHOST VSOCK DRIVER
  M:    Stefan Hajnoczi <[email protected]>
@@@ -13982,6 -13943,12 +13982,6 @@@ F:  drivers/net/vsockmon.
  F:    drivers/vhost/vsock.c
  F:    drivers/vhost/vsock.h
  
 -VIRTUAL SERIO DEVICE DRIVER
 -M:    Stephen Chandler Paul <[email protected]>
 -S:    Maintained
 -F:    drivers/input/serio/userio.c
 -F:    include/uapi/linux/userio.h
 -
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <[email protected]>
  L:    [email protected]
@@@ -14003,15 -13970,6 +14003,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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/virtio/
 +F:    include/uapi/linux/virtio_crypto.h
  
  VIRTIO DRIVERS FOR S390
  M:    Cornelia Huck <[email protected]>
@@@ -14049,11 -14007,45 +14049,11 @@@ S:        Maintaine
  F:    drivers/virtio/virtio_input.c
  F:    include/uapi/linux/virtio_input.h
  
 -VIRTIO CRYPTO DRIVER
 -M:  Gonglei <[email protected]>
 -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 <[email protected]>
 -M:    Harald Welte <[email protected]>
 -S:    Maintained
 -F:    drivers/mmc/host/via-sdmmc.c
 -
 -VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 -M:    Florian Tobias Schandinat <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
 -L:    [email protected]
 +VIRTUAL SERIO DEVICE DRIVER
 +M:    Stephen Chandler Paul <[email protected]>
  S:    Maintained
 -F:    drivers/net/ethernet/via/via-velocity.*
 -
 -VIRT LIB
 -M:    Alex Williamson <[email protected]>
 -M:    Paolo Bonzini <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    virt/lib/
 +F:    drivers/input/serio/userio.c
 +F:    include/uapi/linux/userio.h
  
  VIVID VIRTUAL VIDEO DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -14063,6 -14055,14 +14063,6 @@@ W:  https://linuxtv.or
  S:    Maintained
  F:    drivers/media/platform/vivid/*
  
 -VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 -M:    Helen Koike <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -W:    https://linuxtv.org
 -S:    Maintained
 -F:    drivers/media/platform/vimc/*
 -
  VLYNQ BUS
  M:    Florian Fainelli <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -14082,6 -14082,12 +14082,6 @@@ F:  drivers/staging/vme
  F:    drivers/vme/
  F:    include/linux/vme*
  
 -VMWARE HYPERVISOR INTERFACE
 -M:    Alok Kataria <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    arch/x86/kernel/cpu/vmware.c
 -
  VMWARE BALLOON DRIVER
  M:    Xavier Deguillard <[email protected]>
  M:    Philip Moltmann <[email protected]>
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
 +VMWARE HYPERVISOR INTERFACE
 +M:    Alok Kataria <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/kernel/cpu/vmware.c
 +
 +VMWARE PVRDMA DRIVER
 +M:    Adit Ranadive <[email protected]>
 +M:    VMware PV-Drivers <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/infiniband/hw/vmw_pvrdma/
 +
 +VMware PVSCSI driver
 +M:    Jim Gill <[email protected]>
 +M:    VMware PV-Drivers <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/scsi/vmw_pvscsi.c
 +F:    drivers/scsi/vmw_pvscsi.h
 +
  VMWARE VMMOUSE SUBDRIVER
  M:    "VMware Graphics" <[email protected]>
  M:    "VMware, Inc." <[email protected]>
  S:    Maintained
  F:    drivers/net/vmxnet3/
  
 -VMware PVSCSI driver
 -M:    Jim Gill <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/vmw_pvscsi.c
 -F:    drivers/scsi/vmw_pvscsi.h
 -
 -VMWARE PVRDMA DRIVER
 -M:    Adit Ranadive <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/infiniband/hw/vmw_pvrdma/
 -
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
@@@ -14218,39 -14218,12 +14218,39 @@@ F:        drivers/watchdog
  F:    include/linux/watchdog.h
  F:    include/uapi/linux/watchdog.h
  
 +WHISKEYCOVE PMIC GPIO DRIVER
 +M:    Kuppuswamy Sathyanarayanan <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-wcove.c
 +
  WIIMOTE HID DRIVER
  M:    David Herrmann <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/hid/hid-wiimote*
  
 +WILOCITY WIL6210 WIRELESS DRIVER
 +M:    Maya Erez <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
 +M:    [email protected]
 +L:    [email protected] (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 <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    drivers/gpio/gpio-ws16c48.c
  
 -WIMAX STACK
 -M:    Inaky Perez-Gonzalez <[email protected]>
 -M:    [email protected]
 -L:    [email protected] (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 <[email protected]>
  S:    Maintained
@@@ -14352,6 -14337,15 +14352,6 @@@ S:  Maintaine
  F:    Documentation/x86/
  F:    arch/x86/
  
 -X86 PLATFORM DRIVERS
 -M:    Darren Hart <[email protected]>
 -M:    Andy Shevchenko <[email protected]>
 -L:    [email protected]
 -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 <[email protected]>
  M:    Borislav Petkov <[email protected]>
@@@ -14364,15 -14358,6 +14364,15 @@@ M: Borislav Petkov <[email protected]
  S:    Maintained
  F:    arch/x86/kernel/cpu/microcode/*
  
 +X86 PLATFORM DRIVERS
 +M:    Darren Hart <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -14389,13 -14374,20 +14389,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:    [email protected] (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 <[email protected]>
@@@ -14411,21 -14403,6 +14411,21 @@@ S: Maintaine
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/
  
 +XEN HYPERVISOR INTERFACE
 +M:    Boris Ostrovsky <[email protected]>
 +M:    Juergen Gross <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  M:    Paul Durrant <[email protected]>
@@@ -14441,6 -14418,14 +14441,6 @@@ S:  Supporte
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
 -XEN BLOCK SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 -M:    Roger Pau Monné <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/block/xen-blkback/*
 -F:    drivers/block/xen*
 -
  XEN PVSCSI DRIVERS
  M:    Juergen Gross <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -14517,13 -14502,6 +14517,13 @@@ S: Maintaine
  F:    drivers/net/hamradio/yam*
  F:    include/linux/yam.h
  
 +YAMA SECURITY MODULE
 +M:    Kees Cook <[email protected]>
 +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 <[email protected]>
  L:    [email protected]
@@@ -14558,23 -14536,23 +14558,23 @@@ L:        [email protected] (s
  S:    Maintained
  F:    drivers/net/wireless/zydas/zd1211rw/
  
 -ZD1301_DEMOD MEDIA DRIVER
 +ZD1301 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
  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 <[email protected]>
  L:    [email protected]
  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 <[email protected]>
index e568c8c6f69cb67bf423db51f25d6315a15fbc96,f544103881947e7a07c51e36589fab9a207967d8..cbde0030c092fe1213c4cddb6ffe19383d200e3c
@@@ -26,7 -26,7 +26,7 @@@
  #include <linux/input/tps6507x-ts.h>
  #include <linux/mfd/tps6507x.h>
  #include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
  #include <linux/platform_device.h>
@@@ -1166,7 -1166,7 +1166,7 @@@ static struct tvp514x_platform_data tvp
  
  #define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)
  
 -static const struct vpif_input da850_ch0_inputs[] = {
 +static struct vpif_input da850_ch0_inputs[] = {
        {
                .input = {
                        .index = 0,
        },
  };
  
 -static const struct vpif_input da850_ch1_inputs[] = {
 +static struct vpif_input da850_ch1_inputs[] = {
        {
                .input = {
                        .index = 0,
index ceec21bd30c4fc5c49ad4c4bdbfe9bd031005809,46a161b6962e8d85d8a880234ed5a12ec9fe0fd2..08abd180530ac08a5917c3632dbd3f91398c5e29
@@@ -59,7 -59,7 +59,7 @@@
  #include <linux/mfd/syscon/atmel-matrix.h>
  #include <linux/mfd/syscon/atmel-smc.h>
  #include <linux/module.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
@@@ -1201,7 -1201,7 +1201,7 @@@ static int atmel_smc_nand_prepare_smcco
         * tRC < 30ns implies EDO mode. This controller does not support this
         * mode.
         */
 -      if (conf->timings.sdr.tRC_min < 30)
 +      if (conf->timings.sdr.tRC_min < 30000)
                return -ENOTSUPP;
  
        atmel_smc_cs_conf_init(smcconf);
        ret = atmel_smc_cs_conf_set_timing(smcconf,
                                           ATMEL_HSMC_TIMINGS_TADL_SHIFT,
                                           ncycles);
 -      if (ret)
 +      /*
 +       * Version 4 of the ONFI spec mandates that tADL be at least 400
 +       * nanoseconds, but, depending on the master clock rate, 400 ns may not
 +       * fit in the tADL field of the SMC reg. We need to relax the check and
 +       * accept the -ERANGE return code.
 +       *
 +       * Note that previous versions of the ONFI spec had a lower tADL_min
 +       * (100 or 200 ns). It's not clear why this timing constraint got
 +       * increased but it seems most NANDs are fine with values lower than
 +       * 400ns, so we should be safe.
 +       */
 +      if (ret && ret != -ERANGE)
                return ret;
  
        ncycles = DIV_ROUND_UP(conf->timings.sdr.tAR_min, mckperiodps);
@@@ -2089,8 -2078,8 +2089,8 @@@ atmel_hsmc_nand_controller_legacy_init(
        }
  
        nc->irq = of_irq_get(nand_np, 0);
-       if (nc->irq < 0) {
-               ret = nc->irq;
+       if (nc->irq <= 0) {
+               ret = nc->irq ?: -ENXIO;
                if (ret != -EPROBE_DEFER)
                        dev_err(dev, "Failed to get IRQ number (err = %d)\n",
                                ret);
@@@ -2179,11 -2168,12 +2179,12 @@@ atmel_hsmc_nand_controller_init(struct 
  
        nc->irq = of_irq_get(np, 0);
        of_node_put(np);
-       if (nc->irq < 0) {
-               if (nc->irq != -EPROBE_DEFER)
+       if (nc->irq <= 0) {
+               ret = nc->irq ?: -ENXIO;
+               if (ret != -EPROBE_DEFER)
                        dev_err(dev, "Failed to get IRQ number (err = %d)\n",
-                               nc->irq);
-               return nc->irq;
+                               ret);
+               return ret;
        }
  
        np = of_parse_phandle(dev->of_node, "atmel,nfc-io", 0);
index 8c210a5776bcbea1677e422dc3f06397c831d9cc,27a969a8f105752c98fe3ec74591859ba5669ba0..146af82183145d9d5164665aeaccdf789c4cca98
@@@ -47,7 -47,7 +47,7 @@@
  #include <linux/genalloc.h>
  #include <linux/iopoll.h>
  #include <linux/module.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
  #include <linux/platform_device.h>
@@@ -945,7 -945,6 +945,7 @@@ struct atmel_pmecc *devm_atmel_pmecc_ge
                 */
                struct platform_device *pdev = to_platform_device(userdev);
                const struct atmel_pmecc_caps *caps;
 +              const struct of_device_id *match;
  
                /* No PMECC engine available. */
                if (!of_property_read_bool(userdev->of_node,
  
                caps = &at91sam9g45_caps;
  
 -              /*
 -               * Try to find the NFC subnode and extract the associated caps
 -               * from there.
 -               */
 -              np = of_find_compatible_node(userdev->of_node, NULL,
 -                                           "atmel,sama5d3-nfc");
 -              if (np) {
 -                      const struct of_device_id *match;
 -
 -                      match = of_match_node(atmel_pmecc_legacy_match, np);
 -                      if (match && match->data)
 -                              caps = match->data;
 -
 -                      of_node_put(np);
 -              }
 +              /* Find the caps associated to the NAND dev node. */
 +              match = of_match_node(atmel_pmecc_legacy_match,
 +                                    userdev->of_node);
 +              if (match && match->data)
 +                      caps = match->data;
  
                pmecc = atmel_pmecc_create(pdev, caps, 1, 2);
        }
index c6c18b82f8f4eade18561edb24439a9d4737efa5,6ed5392f3798fecb79b4ea8f608b880a3f9778e6..bcc8cef1c615c5b0336f5310f56ee29a9c44e88a
@@@ -39,7 -39,7 +39,7 @@@
  #include <linux/nmi.h>
  #include <linux/types.h>
  #include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/mtd/nand_ecc.h>
  #include <linux/mtd/nand_bch.h>
  #include <linux/interrupt.h>
@@@ -65,14 -65,8 +65,14 @@@ static int nand_ooblayout_ecc_sp(struc
  
        if (!section) {
                oobregion->offset = 0;
 -              oobregion->length = 4;
 +              if (mtd->oobsize == 16)
 +                      oobregion->length = 4;
 +              else
 +                      oobregion->length = 3;
        } else {
 +              if (mtd->oobsize == 8)
 +                      return -ERANGE;
 +
                oobregion->offset = 6;
                oobregion->length = ecc->total - 4;
        }
@@@ -1131,9 -1125,7 +1131,9 @@@ static int nand_setup_data_interface(st
         * Ensure the timing mode has been changed on the chip side
         * before changing timings on the controller side.
         */
 -      if (chip->onfi_version) {
 +      if (chip->onfi_version &&
 +          (le16_to_cpu(chip->onfi_params.opt_cmd) &
 +           ONFI_OPT_CMD_SET_GET_FEATURES)) {
                u8 tmode_param[ONFI_SUBFEATURE_PARAM_LEN] = {
                        chip->onfi_timing_mode_default,
                };
@@@ -1247,179 -1239,6 +1247,6 @@@ int nand_reset(struct nand_chip *chip, 
        return 0;
  }
  
- /**
-  * __nand_unlock - [REPLACEABLE] unlocks specified locked blocks
-  * @mtd: mtd info
-  * @ofs: offset to start unlock from
-  * @len: length to unlock
-  * @invert:
-  *        - when = 0, unlock the range of blocks within the lower and
-  *                    upper boundary address
-  *        - when = 1, unlock the range of blocks outside the boundaries
-  *                    of the lower and upper boundary address
-  *
-  * Returs unlock status.
-  */
- static int __nand_unlock(struct mtd_info *mtd, loff_t ofs,
-                                       uint64_t len, int invert)
- {
-       int ret = 0;
-       int status, page;
-       struct nand_chip *chip = mtd_to_nand(mtd);
-       /* Submit address of first page to unlock */
-       page = ofs >> chip->page_shift;
-       chip->cmdfunc(mtd, NAND_CMD_UNLOCK1, -1, page & chip->pagemask);
-       /* Submit address of last page to unlock */
-       page = (ofs + len) >> chip->page_shift;
-       chip->cmdfunc(mtd, NAND_CMD_UNLOCK2, -1,
-                               (page | invert) & chip->pagemask);
-       /* Call wait ready function */
-       status = chip->waitfunc(mtd, chip);
-       /* See if device thinks it succeeded */
-       if (status & NAND_STATUS_FAIL) {
-               pr_debug("%s: error status = 0x%08x\n",
-                                       __func__, status);
-               ret = -EIO;
-       }
-       return ret;
- }
- /**
-  * nand_unlock - [REPLACEABLE] unlocks specified locked blocks
-  * @mtd: mtd info
-  * @ofs: offset to start unlock from
-  * @len: length to unlock
-  *
-  * Returns unlock status.
-  */
- int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
- {
-       int ret = 0;
-       int chipnr;
-       struct nand_chip *chip = mtd_to_nand(mtd);
-       pr_debug("%s: start = 0x%012llx, len = %llu\n",
-                       __func__, (unsigned long long)ofs, len);
-       if (check_offs_len(mtd, ofs, len))
-               return -EINVAL;
-       /* Align to last block address if size addresses end of the device */
-       if (ofs + len == mtd->size)
-               len -= mtd->erasesize;
-       nand_get_device(mtd, FL_UNLOCKING);
-       /* Shift to get chip number */
-       chipnr = ofs >> chip->chip_shift;
-       /*
-        * Reset the chip.
-        * If we want to check the WP through READ STATUS and check the bit 7
-        * we must reset the chip
-        * some operation can also clear the bit 7 of status register
-        * eg. erase/program a locked block
-        */
-       nand_reset(chip, chipnr);
-       chip->select_chip(mtd, chipnr);
-       /* Check, if it is write protected */
-       if (nand_check_wp(mtd)) {
-               pr_debug("%s: device is write protected!\n",
-                                       __func__);
-               ret = -EIO;
-               goto out;
-       }
-       ret = __nand_unlock(mtd, ofs, len, 0);
- out:
-       chip->select_chip(mtd, -1);
-       nand_release_device(mtd);
-       return ret;
- }
- EXPORT_SYMBOL(nand_unlock);
- /**
-  * nand_lock - [REPLACEABLE] locks all blocks present in the device
-  * @mtd: mtd info
-  * @ofs: offset to start unlock from
-  * @len: length to unlock
-  *
-  * This feature is not supported in many NAND parts. 'Micron' NAND parts do
-  * have this feature, but it allows only to lock all blocks, not for specified
-  * range for block. Implementing 'lock' feature by making use of 'unlock', for
-  * now.
-  *
-  * Returns lock status.
-  */
- int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
- {
-       int ret = 0;
-       int chipnr, status, page;
-       struct nand_chip *chip = mtd_to_nand(mtd);
-       pr_debug("%s: start = 0x%012llx, len = %llu\n",
-                       __func__, (unsigned long long)ofs, len);
-       if (check_offs_len(mtd, ofs, len))
-               return -EINVAL;
-       nand_get_device(mtd, FL_LOCKING);
-       /* Shift to get chip number */
-       chipnr = ofs >> chip->chip_shift;
-       /*
-        * Reset the chip.
-        * If we want to check the WP through READ STATUS and check the bit 7
-        * we must reset the chip
-        * some operation can also clear the bit 7 of status register
-        * eg. erase/program a locked block
-        */
-       nand_reset(chip, chipnr);
-       chip->select_chip(mtd, chipnr);
-       /* Check, if it is write protected */
-       if (nand_check_wp(mtd)) {
-               pr_debug("%s: device is write protected!\n",
-                                       __func__);
-               status = MTD_ERASE_FAILED;
-               ret = -EIO;
-               goto out;
-       }
-       /* Submit address of first page to lock */
-       page = ofs >> chip->page_shift;
-       chip->cmdfunc(mtd, NAND_CMD_LOCK, -1, page & chip->pagemask);
-       /* Call wait ready function */
-       status = chip->waitfunc(mtd, chip);
-       /* See if device thinks it succeeded */
-       if (status & NAND_STATUS_FAIL) {
-               pr_debug("%s: error status = 0x%08x\n",
-                                       __func__, status);
-               ret = -EIO;
-               goto out;
-       }
-       ret = __nand_unlock(mtd, ofs, len, 0x1);
- out:
-       chip->select_chip(mtd, -1);
-       nand_release_device(mtd);
-       return ret;
- }
- EXPORT_SYMBOL(nand_lock);
  /**
   * nand_check_erased_buf - check if a buffer contains (almost) only 0xff data
   * @buf: buffer to test
@@@ -2749,6 -2568,7 +2576,6 @@@ static int nand_write_page_syndrome(str
   * @buf: the data to write
   * @oob_required: must write chip->oob_poi to OOB
   * @page: page number to write
 - * @cached: cached programming
   * @raw: use _raw version of write_page
   */
  static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
@@@ -3993,10 -3813,13 +3820,13 @@@ static void nand_manufacturer_detect(st
         * nand_decode_ext_id() otherwise.
         */
        if (chip->manufacturer.desc && chip->manufacturer.desc->ops &&
-           chip->manufacturer.desc->ops->detect)
+           chip->manufacturer.desc->ops->detect) {
+               /* The 3rd id byte holds MLC / multichip data */
+               chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]);
                chip->manufacturer.desc->ops->detect(chip);
-       else
+       } else {
                nand_decode_ext_id(chip);
+       }
  }
  
  /*
@@@ -4036,7 -3859,7 +3866,7 @@@ static int nand_detect(struct nand_chi
        const struct nand_manufacturer *manufacturer;
        struct mtd_info *mtd = nand_to_mtd(chip);
        int busw;
-       int i, ret;
+       int i;
        u8 *id_data = chip->id.data;
        u8 maf_id, dev_id;
  
        chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);
  
        /* Read entire ID string */
-       for (i = 0; i < 8; i++)
+       for (i = 0; i < ARRAY_SIZE(chip->id.data); i++)
                id_data[i] = chip->read_byte(mtd);
  
        if (id_data[0] != maf_id || id_data[1] != dev_id) {
                return -ENODEV;
        }
  
-       chip->id.len = nand_id_len(id_data, 8);
+       chip->id.len = nand_id_len(id_data, ARRAY_SIZE(chip->id.data));
  
        /* Try to identify manufacturer */
        manufacturer = nand_get_manufacturer(maf_id);
@@@ -4177,10 -4000,6 +4007,6 @@@ ident_done
        if (mtd->writesize > 512 && chip->cmdfunc == nand_command)
                chip->cmdfunc = nand_command_lp;
  
-       ret = nand_manufacturer_init(chip);
-       if (ret)
-               return ret;
        pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
                maf_id, dev_id);
  
@@@ -4388,23 -4207,6 +4214,6 @@@ int nand_scan_ident(struct mtd_info *mt
                return ret;
        }
  
-       /* Initialize the ->data_interface field. */
-       ret = nand_init_data_interface(chip);
-       if (ret)
-               goto err_nand_init;
-       /*
-        * Setup the data interface correctly on the chip and controller side.
-        * This explicit call to nand_setup_data_interface() is only required
-        * for the first die, because nand_reset() has been called before
-        * ->data_interface and ->default_onfi_timing_mode were set.
-        * For the other dies, nand_reset() will automatically switch to the
-        * best mode for us.
-        */
-       ret = nand_setup_data_interface(chip, 0);
-       if (ret)
-               goto err_nand_init;
        nand_maf_id = chip->id.data[0];
        nand_dev_id = chip->id.data[1];
  
        mtd->size = i * chip->chipsize;
  
        return 0;
- err_nand_init:
-       /* Free manufacturer priv data. */
-       nand_manufacturer_cleanup(chip);
-       return ret;
  }
  EXPORT_SYMBOL(nand_scan_ident);
  
@@@ -4826,55 -4622,60 +4629,60 @@@ int nand_scan_tail(struct mtd_info *mtd
        struct nand_chip *chip = mtd_to_nand(mtd);
        struct nand_ecc_ctrl *ecc = &chip->ecc;
        struct nand_buffers *nbuf = NULL;
-       int ret;
+       int ret, i;
  
        /* New bad blocks should be marked in OOB, flash-based BBT, or both */
        if (WARN_ON((chip->bbt_options & NAND_BBT_NO_OOB_BBM) &&
                   !(chip->bbt_options & NAND_BBT_USE_FLASH))) {
-               ret = -EINVAL;
-               goto err_ident;
+               return -EINVAL;
        }
  
        if (invalid_ecc_page_accessors(chip)) {
                pr_err("Invalid ECC page accessors setup\n");
-               ret = -EINVAL;
-               goto err_ident;
+               return -EINVAL;
        }
  
        if (!(chip->options & NAND_OWN_BUFFERS)) {
                nbuf = kzalloc(sizeof(*nbuf), GFP_KERNEL);
-               if (!nbuf) {
-                       ret = -ENOMEM;
-                       goto err_ident;
-               }
+               if (!nbuf)
+                       return -ENOMEM;
  
                nbuf->ecccalc = kmalloc(mtd->oobsize, GFP_KERNEL);
                if (!nbuf->ecccalc) {
                        ret = -ENOMEM;
-                       goto err_free;
+                       goto err_free_nbuf;
                }
  
                nbuf->ecccode = kmalloc(mtd->oobsize, GFP_KERNEL);
                if (!nbuf->ecccode) {
                        ret = -ENOMEM;
-                       goto err_free;
+                       goto err_free_nbuf;
                }
  
                nbuf->databuf = kmalloc(mtd->writesize + mtd->oobsize,
                                        GFP_KERNEL);
                if (!nbuf->databuf) {
                        ret = -ENOMEM;
-                       goto err_free;
+                       goto err_free_nbuf;
                }
  
                chip->buffers = nbuf;
-       } else {
-               if (!chip->buffers) {
-                       ret = -ENOMEM;
-                       goto err_ident;
-               }
+       } else if (!chip->buffers) {
+               return -ENOMEM;
        }
  
+       /*
+        * FIXME: some NAND manufacturer drivers expect the first die to be
+        * selected when manufacturer->init() is called. They should be fixed
+        * to explictly select the relevant die when interacting with the NAND
+        * chip.
+        */
+       chip->select_chip(mtd, 0);
+       ret = nand_manufacturer_init(chip);
+       chip->select_chip(mtd, -1);
+       if (ret)
+               goto err_free_nbuf;
        /* Set the internal oob buffer location, just after the page data */
        chip->oob_poi = chip->buffers->databuf + mtd->writesize;
  
                        WARN(1, "No oob scheme defined for oobsize %d\n",
                                mtd->oobsize);
                        ret = -EINVAL;
-                       goto err_free;
+                       goto err_nand_manuf_cleanup;
                }
        }
  
                if (!ecc->calculate || !ecc->correct || !ecc->hwctl) {
                        WARN(1, "No ECC functions supplied; hardware ECC not possible\n");
                        ret = -EINVAL;
-                       goto err_free;
+                       goto err_nand_manuf_cleanup;
                }
                if (!ecc->read_page)
                        ecc->read_page = nand_read_page_hwecc_oob_first;
                     ecc->write_page == nand_write_page_hwecc)) {
                        WARN(1, "No ECC functions supplied; hardware ECC not possible\n");
                        ret = -EINVAL;
-                       goto err_free;
+                       goto err_nand_manuf_cleanup;
                }
                /* Use standard syndrome read/write page function? */
                if (!ecc->read_page)
                        if (!ecc->strength) {
                                WARN(1, "Driver must set ecc.strength when using hardware ECC\n");
                                ret = -EINVAL;
-                               goto err_free;
+                               goto err_nand_manuf_cleanup;
                        }
                        break;
                }
                ret = nand_set_ecc_soft_ops(mtd);
                if (ret) {
                        ret = -EINVAL;
-                       goto err_free;
+                       goto err_nand_manuf_cleanup;
                }
                break;
  
                if (!ecc->read_page || !ecc->write_page) {
                        WARN(1, "No ECC functions supplied; on-die ECC not possible\n");
                        ret = -EINVAL;
-                       goto err_free;
+                       goto err_nand_manuf_cleanup;
                }
                if (!ecc->read_oob)
                        ecc->read_oob = nand_read_oob_std;
        default:
                WARN(1, "Invalid NAND_ECC_MODE %d\n", ecc->mode);
                ret = -EINVAL;
-               goto err_free;
+               goto err_nand_manuf_cleanup;
        }
  
        /* For many systems, the standard OOB write also works for raw */
        if (ecc->steps * ecc->size != mtd->writesize) {
                WARN(1, "Invalid ECC parameters\n");
                ret = -EINVAL;
-               goto err_free;
+               goto err_nand_manuf_cleanup;
        }
        ecc->total = ecc->steps * ecc->bytes;
        if (ecc->total > mtd->oobsize) {
                WARN(1, "Total number of ECC bytes exceeded oobsize\n");
                ret = -EINVAL;
-               goto err_free;
+               goto err_nand_manuf_cleanup;
        }
  
        /*
        if (!mtd->bitflip_threshold)
                mtd->bitflip_threshold = DIV_ROUND_UP(mtd->ecc_strength * 3, 4);
  
+       /* Initialize the ->data_interface field. */
+       ret = nand_init_data_interface(chip);
+       if (ret)
+               goto err_nand_manuf_cleanup;
+       /* Enter fastest possible mode on all dies. */
+       for (i = 0; i < chip->numchips; i++) {
+               chip->select_chip(mtd, i);
+               ret = nand_setup_data_interface(chip, i);
+               chip->select_chip(mtd, -1);
+               if (ret)
+                       goto err_nand_data_iface_cleanup;
+       }
        /* Check, if we should skip the bad block table scan */
        if (chip->options & NAND_SKIP_BBTSCAN)
                return 0;
        /* Build bad block table */
        ret = chip->scan_bbt(mtd);
        if (ret)
-               goto err_free;
+               goto err_nand_data_iface_cleanup;
        return 0;
  
- err_free:
+ err_nand_data_iface_cleanup:
+       nand_release_data_interface(chip);
+ err_nand_manuf_cleanup:
+       nand_manufacturer_cleanup(chip);
+ err_free_nbuf:
        if (nbuf) {
                kfree(nbuf->databuf);
                kfree(nbuf->ecccode);
                kfree(nbuf);
        }
  
- err_ident:
-       /* Clean up nand_scan_ident(). */
-       /* Free manufacturer priv data. */
-       nand_manufacturer_cleanup(chip);
        return ret;
  }
  EXPORT_SYMBOL(nand_scan_tail);
index 7e36d7d13c268fc2317c330f7688e188e81d6bdc,90228b9735bd8990c91f3041e551bcb5ce0bdd6d..5d1533bcc5bdaa07b6cd9fc61c1af0dd5cb0fe99
@@@ -11,7 -11,7 +11,7 @@@
  #include <linux/kernel.h>
  #include <linux/err.h>
  #include <linux/export.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  
  static const struct nand_data_interface onfi_sdr_timings[] = {
        /* Mode 0 */
@@@ -311,9 -311,9 +311,9 @@@ int onfi_init_data_interface(struct nan
                struct nand_sdr_timings *timings = &iface->timings.sdr;
  
                /* microseconds -> picoseconds */
 -              timings->tPROG_max = 1000000UL * le16_to_cpu(params->t_prog);
 -              timings->tBERS_max = 1000000UL * le16_to_cpu(params->t_bers);
 -              timings->tR_max = 1000000UL * le16_to_cpu(params->t_r);
 +              timings->tPROG_max = 1000000ULL * le16_to_cpu(params->t_prog);
 +              timings->tBERS_max = 1000000ULL * le16_to_cpu(params->t_bers);
 +              timings->tR_max = 1000000ULL * le16_to_cpu(params->t_r);
  
                /* nanoseconds -> picoseconds */
                timings->tCCS_min = 1000UL * le16_to_cpu(params->t_ccs);
index 1ddf0b73c24661833211732a55016d57ee7ac3a0,5ba46354bf0f210b9823f3a9f56b57d66f0d9b19..fec613221958c435ab3343e5e16ee02bb2174093
@@@ -33,7 -33,7 +33,7 @@@
  #include <linux/errno.h>
  #include <linux/string.h>
  #include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/mtd/nand_bch.h>
  #include <linux/mtd/partitions.h>
  #include <linux/delay.h>
@@@ -287,6 -287,11 +287,6 @@@ MODULE_PARM_DESC(bch,              "Enable BCH ec
  /* Maximum page cache pages needed to read or write a NAND page to the cache_file */
  #define NS_MAX_HELD_PAGES 16
  
 -struct nandsim_debug_info {
 -      struct dentry *dfs_root;
 -      struct dentry *dfs_wear_report;
 -};
 -
  /*
   * A union to represent flash memory contents and flash buffer.
   */
@@@ -365,6 -370,8 +365,6 @@@ struct nandsim 
        void *file_buf;
        struct page *held_pages[NS_MAX_HELD_PAGES];
        int held_cnt;
 -
 -      struct nandsim_debug_info dbg;
  };
  
  /*
@@@ -517,23 -524,39 +517,23 @@@ static const struct file_operations dfs
   */
  static int nandsim_debugfs_create(struct nandsim *dev)
  {
 -      struct nandsim_debug_info *dbg = &dev->dbg;
 +      struct dentry *root = nsmtd->dbg.dfs_dir;
        struct dentry *dent;
  
        if (!IS_ENABLED(CONFIG_DEBUG_FS))
                return 0;
  
 -      dent = debugfs_create_dir("nandsim", NULL);
 -      if (!dent) {
 -              NS_ERR("cannot create \"nandsim\" debugfs directory\n");
 -              return -ENODEV;
 -      }
 -      dbg->dfs_root = dent;
 +      if (IS_ERR_OR_NULL(root))
 +              return -1;
  
 -      dent = debugfs_create_file("wear_report", S_IRUSR,
 -                                 dbg->dfs_root, dev, &dfs_fops);
 -      if (!dent)
 -              goto out_remove;
 -      dbg->dfs_wear_report = dent;
 +      dent = debugfs_create_file("nandsim_wear_report", S_IRUSR,
 +                                 root, dev, &dfs_fops);
 +      if (IS_ERR_OR_NULL(dent)) {
 +              NS_ERR("cannot create \"nandsim_wear_report\" debugfs entry\n");
 +              return -1;
 +      }
  
        return 0;
 -
 -out_remove:
 -      debugfs_remove_recursive(dbg->dfs_root);
 -      return -ENODEV;
 -}
 -
 -/**
 - * nandsim_debugfs_remove - destroy all debugfs files
 - */
 -static void nandsim_debugfs_remove(struct nandsim *ns)
 -{
 -      if (IS_ENABLED(CONFIG_DEBUG_FS))
 -              debugfs_remove_recursive(ns->dbg.dfs_root);
  }
  
  /*
@@@ -2329,6 -2352,9 +2329,6 @@@ static int __init ns_init_module(void
        if ((retval = setup_wear_reporting(nsmtd)) != 0)
                goto err_exit;
  
 -      if ((retval = nandsim_debugfs_create(nand)) != 0)
 -              goto err_exit;
 -
        if ((retval = init_nandsim(nsmtd)) != 0)
                goto err_exit;
  
        if (retval != 0)
                goto err_exit;
  
 +      if ((retval = nandsim_debugfs_create(nand)) != 0)
 +              goto err_exit;
 +
          return 0;
  
  err_exit:
@@@ -2372,6 -2395,7 +2372,6 @@@ static void __exit ns_cleanup_module(vo
        struct nandsim *ns = nand_get_controller_data(chip);
        int i;
  
 -      nandsim_debugfs_remove(ns);
        free_nandsim(ns);    /* Free nandsim private resources */
        nand_release(nsmtd); /* Unregister driver */
        for (i = 0;i < ARRAY_SIZE(ns->partitions); ++i)
index 6abd142b13246f1189e189c03d3ff499665c1b0b,f1cd5eb47e51e369a08a0fc25c08f76a580dfaf2..82244be3e766848568e6a77d6d610b61c4362c3a
@@@ -31,7 -31,7 +31,7 @@@
  #include <linux/of_device.h>
  #include <linux/of_gpio.h>
  #include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/mtd/partitions.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
@@@ -1728,10 -1728,6 +1728,10 @@@ static int sunxi_nfc_setup_data_interfa
         */
        chip->clk_rate = NSEC_PER_SEC / min_clk_period;
        real_clk_rate = clk_round_rate(nfc->mod_clk, chip->clk_rate);
 +      if (real_clk_rate <= 0) {
 +              dev_err(nfc->dev, "Unable to round clk %lu\n", chip->clk_rate);
 +              return -EINVAL;
 +      }
  
        /*
         * ONFI specification 3.1, paragraph 4.15.2 dictates that EDO data
@@@ -2212,7 -2208,7 +2212,7 @@@ static int sunxi_nfc_probe(struct platf
        if (ret)
                goto out_ahb_clk_unprepare;
  
-       nfc->reset = devm_reset_control_get_optional(dev, "ahb");
+       nfc->reset = devm_reset_control_get_optional_exclusive(dev, "ahb");
        if (IS_ERR(nfc->reset)) {
                ret = PTR_ERR(nfc->reset);
                goto out_mod_clk_unprepare;
index 0000000000000000000000000000000000000000,c433f093766abe392bdd0f8492a02161d954d152..2b05f4273babda7bde2247c07bf90f9363a73e7e
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,1321 +1,1321 @@@
 -      u32 tBERS_max;
+ /*
+  *  Copyright © 2000-2010 David Woodhouse <[email protected]>
+  *                        Steven J. Hill <[email protected]>
+  *                      Thomas Gleixner <[email protected]>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  *
+  * Info:
+  *    Contains standard defines and IDs for NAND flash devices
+  *
+  * Changelog:
+  *    See git changelog.
+  */
+ #ifndef __LINUX_MTD_RAWNAND_H
+ #define __LINUX_MTD_RAWNAND_H
+ #include <linux/wait.h>
+ #include <linux/spinlock.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/flashchip.h>
+ #include <linux/mtd/bbm.h>
+ struct mtd_info;
+ struct nand_flash_dev;
+ struct device_node;
+ /* Scan and identify a NAND device */
+ int nand_scan(struct mtd_info *mtd, int max_chips);
+ /*
+  * Separate phases of nand_scan(), allowing board driver to intervene
+  * and override command or ECC setup according to flash type.
+  */
+ int nand_scan_ident(struct mtd_info *mtd, int max_chips,
+                          struct nand_flash_dev *table);
+ int nand_scan_tail(struct mtd_info *mtd);
+ /* Unregister the MTD device and free resources held by the NAND device */
+ void nand_release(struct mtd_info *mtd);
+ /* Internal helper for board drivers which need to override command function */
+ void nand_wait_ready(struct mtd_info *mtd);
+ /* The maximum number of NAND chips in an array */
+ #define NAND_MAX_CHIPS                8
+ /*
+  * Constants for hardware specific CLE/ALE/NCE function
+  *
+  * These are bits which can be or'ed to set/clear multiple
+  * bits in one go.
+  */
+ /* Select the chip by setting nCE to low */
+ #define NAND_NCE              0x01
+ /* Select the command latch by setting CLE to high */
+ #define NAND_CLE              0x02
+ /* Select the address latch by setting ALE to high */
+ #define NAND_ALE              0x04
+ #define NAND_CTRL_CLE         (NAND_NCE | NAND_CLE)
+ #define NAND_CTRL_ALE         (NAND_NCE | NAND_ALE)
+ #define NAND_CTRL_CHANGE      0x80
+ /*
+  * Standard NAND flash commands
+  */
+ #define NAND_CMD_READ0                0
+ #define NAND_CMD_READ1                1
+ #define NAND_CMD_RNDOUT               5
+ #define NAND_CMD_PAGEPROG     0x10
+ #define NAND_CMD_READOOB      0x50
+ #define NAND_CMD_ERASE1               0x60
+ #define NAND_CMD_STATUS               0x70
+ #define NAND_CMD_SEQIN                0x80
+ #define NAND_CMD_RNDIN                0x85
+ #define NAND_CMD_READID               0x90
+ #define NAND_CMD_ERASE2               0xd0
+ #define NAND_CMD_PARAM                0xec
+ #define NAND_CMD_GET_FEATURES 0xee
+ #define NAND_CMD_SET_FEATURES 0xef
+ #define NAND_CMD_RESET                0xff
+ /* Extended commands for large page devices */
+ #define NAND_CMD_READSTART    0x30
+ #define NAND_CMD_RNDOUTSTART  0xE0
+ #define NAND_CMD_CACHEDPROG   0x15
+ #define NAND_CMD_NONE         -1
+ /* Status bits */
+ #define NAND_STATUS_FAIL      0x01
+ #define NAND_STATUS_FAIL_N1   0x02
+ #define NAND_STATUS_TRUE_READY        0x20
+ #define NAND_STATUS_READY     0x40
+ #define NAND_STATUS_WP                0x80
+ #define NAND_DATA_IFACE_CHECK_ONLY    -1
+ /*
+  * Constants for ECC_MODES
+  */
+ typedef enum {
+       NAND_ECC_NONE,
+       NAND_ECC_SOFT,
+       NAND_ECC_HW,
+       NAND_ECC_HW_SYNDROME,
+       NAND_ECC_HW_OOB_FIRST,
+       NAND_ECC_ON_DIE,
+ } nand_ecc_modes_t;
+ enum nand_ecc_algo {
+       NAND_ECC_UNKNOWN,
+       NAND_ECC_HAMMING,
+       NAND_ECC_BCH,
+ };
+ /*
+  * Constants for Hardware ECC
+  */
+ /* Reset Hardware ECC for read */
+ #define NAND_ECC_READ         0
+ /* Reset Hardware ECC for write */
+ #define NAND_ECC_WRITE                1
+ /* Enable Hardware ECC before syndrome is read back from flash */
+ #define NAND_ECC_READSYN      2
+ /*
+  * Enable generic NAND 'page erased' check. This check is only done when
+  * ecc.correct() returns -EBADMSG.
+  * Set this flag if your implementation does not fix bitflips in erased
+  * pages and you want to rely on the default implementation.
+  */
+ #define NAND_ECC_GENERIC_ERASED_CHECK BIT(0)
+ #define NAND_ECC_MAXIMIZE             BIT(1)
+ /*
+  * If your controller already sends the required NAND commands when
+  * reading or writing a page, then the framework is not supposed to
+  * send READ0 and SEQIN/PAGEPROG respectively.
+  */
+ #define NAND_ECC_CUSTOM_PAGE_ACCESS   BIT(2)
+ /* Bit mask for flags passed to do_nand_read_ecc */
+ #define NAND_GET_DEVICE               0x80
+ /*
+  * Option constants for bizarre disfunctionality and real
+  * features.
+  */
+ /* Buswidth is 16 bit */
+ #define NAND_BUSWIDTH_16      0x00000002
+ /* Chip has cache program function */
+ #define NAND_CACHEPRG         0x00000008
+ /*
+  * Chip requires ready check on read (for auto-incremented sequential read).
+  * True only for small page devices; large page devices do not support
+  * autoincrement.
+  */
+ #define NAND_NEED_READRDY     0x00000100
+ /* Chip does not allow subpage writes */
+ #define NAND_NO_SUBPAGE_WRITE 0x00000200
+ /* Device is one of 'new' xD cards that expose fake nand command set */
+ #define NAND_BROKEN_XD                0x00000400
+ /* Device behaves just like nand, but is readonly */
+ #define NAND_ROM              0x00000800
+ /* Device supports subpage reads */
+ #define NAND_SUBPAGE_READ     0x00001000
+ /*
+  * Some MLC NANDs need data scrambling to limit bitflips caused by repeated
+  * patterns.
+  */
+ #define NAND_NEED_SCRAMBLING  0x00002000
+ /* Options valid for Samsung large page devices */
+ #define NAND_SAMSUNG_LP_OPTIONS NAND_CACHEPRG
+ /* Macros to identify the above */
+ #define NAND_HAS_CACHEPROG(chip) ((chip->options & NAND_CACHEPRG))
+ #define NAND_HAS_SUBPAGE_READ(chip) ((chip->options & NAND_SUBPAGE_READ))
+ #define NAND_HAS_SUBPAGE_WRITE(chip) !((chip)->options & NAND_NO_SUBPAGE_WRITE)
+ /* Non chip related options */
+ /* This option skips the bbt scan during initialization. */
+ #define NAND_SKIP_BBTSCAN     0x00010000
+ /*
+  * This option is defined if the board driver allocates its own buffers
+  * (e.g. because it needs them DMA-coherent).
+  */
+ #define NAND_OWN_BUFFERS      0x00020000
+ /* Chip may not exist, so silence any errors in scan */
+ #define NAND_SCAN_SILENT_NODEV        0x00040000
+ /*
+  * Autodetect nand buswidth with readid/onfi.
+  * This suppose the driver will configure the hardware in 8 bits mode
+  * when calling nand_scan_ident, and update its configuration
+  * before calling nand_scan_tail.
+  */
+ #define NAND_BUSWIDTH_AUTO      0x00080000
+ /*
+  * This option could be defined by controller drivers to protect against
+  * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
+  */
+ #define NAND_USE_BOUNCE_BUFFER        0x00100000
+ /*
+  * In case your controller is implementing ->cmd_ctrl() and is relying on the
+  * default ->cmdfunc() implementation, you may want to let the core handle the
+  * tCCS delay which is required when a column change (RNDIN or RNDOUT) is
+  * requested.
+  * If your controller already takes care of this delay, you don't need to set
+  * this flag.
+  */
+ #define NAND_WAIT_TCCS                0x00200000
+ /* Options set by nand scan */
+ /* Nand scan has allocated controller struct */
+ #define NAND_CONTROLLER_ALLOC 0x80000000
+ /* Cell info constants */
+ #define NAND_CI_CHIPNR_MSK    0x03
+ #define NAND_CI_CELLTYPE_MSK  0x0C
+ #define NAND_CI_CELLTYPE_SHIFT        2
+ /* Keep gcc happy */
+ struct nand_chip;
+ /* ONFI features */
+ #define ONFI_FEATURE_16_BIT_BUS               (1 << 0)
+ #define ONFI_FEATURE_EXT_PARAM_PAGE   (1 << 7)
+ /* ONFI timing mode, used in both asynchronous and synchronous mode */
+ #define ONFI_TIMING_MODE_0            (1 << 0)
+ #define ONFI_TIMING_MODE_1            (1 << 1)
+ #define ONFI_TIMING_MODE_2            (1 << 2)
+ #define ONFI_TIMING_MODE_3            (1 << 3)
+ #define ONFI_TIMING_MODE_4            (1 << 4)
+ #define ONFI_TIMING_MODE_5            (1 << 5)
+ #define ONFI_TIMING_MODE_UNKNOWN      (1 << 6)
+ /* ONFI feature address */
+ #define ONFI_FEATURE_ADDR_TIMING_MODE 0x1
+ /* Vendor-specific feature address (Micron) */
+ #define ONFI_FEATURE_ADDR_READ_RETRY  0x89
+ #define ONFI_FEATURE_ON_DIE_ECC               0x90
+ #define   ONFI_FEATURE_ON_DIE_ECC_EN  BIT(3)
+ /* ONFI subfeature parameters length */
+ #define ONFI_SUBFEATURE_PARAM_LEN     4
+ /* ONFI optional commands SET/GET FEATURES supported? */
+ #define ONFI_OPT_CMD_SET_GET_FEATURES (1 << 2)
+ struct nand_onfi_params {
+       /* rev info and features block */
+       /* 'O' 'N' 'F' 'I'  */
+       u8 sig[4];
+       __le16 revision;
+       __le16 features;
+       __le16 opt_cmd;
+       u8 reserved0[2];
+       __le16 ext_param_page_length; /* since ONFI 2.1 */
+       u8 num_of_param_pages;        /* since ONFI 2.1 */
+       u8 reserved1[17];
+       /* manufacturer information block */
+       char manufacturer[12];
+       char model[20];
+       u8 jedec_id;
+       __le16 date_code;
+       u8 reserved2[13];
+       /* memory organization block */
+       __le32 byte_per_page;
+       __le16 spare_bytes_per_page;
+       __le32 data_bytes_per_ppage;
+       __le16 spare_bytes_per_ppage;
+       __le32 pages_per_block;
+       __le32 blocks_per_lun;
+       u8 lun_count;
+       u8 addr_cycles;
+       u8 bits_per_cell;
+       __le16 bb_per_lun;
+       __le16 block_endurance;
+       u8 guaranteed_good_blocks;
+       __le16 guaranteed_block_endurance;
+       u8 programs_per_page;
+       u8 ppage_attr;
+       u8 ecc_bits;
+       u8 interleaved_bits;
+       u8 interleaved_ops;
+       u8 reserved3[13];
+       /* electrical parameter block */
+       u8 io_pin_capacitance_max;
+       __le16 async_timing_mode;
+       __le16 program_cache_timing_mode;
+       __le16 t_prog;
+       __le16 t_bers;
+       __le16 t_r;
+       __le16 t_ccs;
+       __le16 src_sync_timing_mode;
+       u8 src_ssync_features;
+       __le16 clk_pin_capacitance_typ;
+       __le16 io_pin_capacitance_typ;
+       __le16 input_pin_capacitance_typ;
+       u8 input_pin_capacitance_max;
+       u8 driver_strength_support;
+       __le16 t_int_r;
+       __le16 t_adl;
+       u8 reserved4[8];
+       /* vendor */
+       __le16 vendor_revision;
+       u8 vendor[88];
+       __le16 crc;
+ } __packed;
+ #define ONFI_CRC_BASE 0x4F4E
+ /* Extended ECC information Block Definition (since ONFI 2.1) */
+ struct onfi_ext_ecc_info {
+       u8 ecc_bits;
+       u8 codeword_size;
+       __le16 bb_per_lun;
+       __le16 block_endurance;
+       u8 reserved[2];
+ } __packed;
+ #define ONFI_SECTION_TYPE_0   0       /* Unused section. */
+ #define ONFI_SECTION_TYPE_1   1       /* for additional sections. */
+ #define ONFI_SECTION_TYPE_2   2       /* for ECC information. */
+ struct onfi_ext_section {
+       u8 type;
+       u8 length;
+ } __packed;
+ #define ONFI_EXT_SECTION_MAX 8
+ /* Extended Parameter Page Definition (since ONFI 2.1) */
+ struct onfi_ext_param_page {
+       __le16 crc;
+       u8 sig[4];             /* 'E' 'P' 'P' 'S' */
+       u8 reserved0[10];
+       struct onfi_ext_section sections[ONFI_EXT_SECTION_MAX];
+       /*
+        * The actual size of the Extended Parameter Page is in
+        * @ext_param_page_length of nand_onfi_params{}.
+        * The following are the variable length sections.
+        * So we do not add any fields below. Please see the ONFI spec.
+        */
+ } __packed;
+ struct jedec_ecc_info {
+       u8 ecc_bits;
+       u8 codeword_size;
+       __le16 bb_per_lun;
+       __le16 block_endurance;
+       u8 reserved[2];
+ } __packed;
+ /* JEDEC features */
+ #define JEDEC_FEATURE_16_BIT_BUS      (1 << 0)
+ struct nand_jedec_params {
+       /* rev info and features block */
+       /* 'J' 'E' 'S' 'D'  */
+       u8 sig[4];
+       __le16 revision;
+       __le16 features;
+       u8 opt_cmd[3];
+       __le16 sec_cmd;
+       u8 num_of_param_pages;
+       u8 reserved0[18];
+       /* manufacturer information block */
+       char manufacturer[12];
+       char model[20];
+       u8 jedec_id[6];
+       u8 reserved1[10];
+       /* memory organization block */
+       __le32 byte_per_page;
+       __le16 spare_bytes_per_page;
+       u8 reserved2[6];
+       __le32 pages_per_block;
+       __le32 blocks_per_lun;
+       u8 lun_count;
+       u8 addr_cycles;
+       u8 bits_per_cell;
+       u8 programs_per_page;
+       u8 multi_plane_addr;
+       u8 multi_plane_op_attr;
+       u8 reserved3[38];
+       /* electrical parameter block */
+       __le16 async_sdr_speed_grade;
+       __le16 toggle_ddr_speed_grade;
+       __le16 sync_ddr_speed_grade;
+       u8 async_sdr_features;
+       u8 toggle_ddr_features;
+       u8 sync_ddr_features;
+       __le16 t_prog;
+       __le16 t_bers;
+       __le16 t_r;
+       __le16 t_r_multi_plane;
+       __le16 t_ccs;
+       __le16 io_pin_capacitance_typ;
+       __le16 input_pin_capacitance_typ;
+       __le16 clk_pin_capacitance_typ;
+       u8 driver_strength_support;
+       __le16 t_adl;
+       u8 reserved4[36];
+       /* ECC and endurance block */
+       u8 guaranteed_good_blocks;
+       __le16 guaranteed_block_endurance;
+       struct jedec_ecc_info ecc_info[4];
+       u8 reserved5[29];
+       /* reserved */
+       u8 reserved6[148];
+       /* vendor */
+       __le16 vendor_rev_num;
+       u8 reserved7[88];
+       /* CRC for Parameter Page */
+       __le16 crc;
+ } __packed;
+ /* The maximum expected count of bytes in the NAND ID sequence */
+ #define NAND_MAX_ID_LEN 8
+ /**
+  * struct nand_id - NAND id structure
+  * @data: buffer containing the id bytes.
+  * @len: ID length.
+  */
+ struct nand_id {
+       u8 data[NAND_MAX_ID_LEN];
+       int len;
+ };
+ /**
+  * struct nand_hw_control - Control structure for hardware controller (e.g ECC generator) shared among independent devices
+  * @lock:               protection lock
+  * @active:           the mtd device which holds the controller currently
+  * @wq:                       wait queue to sleep on if a NAND operation is in
+  *                    progress used instead of the per chip wait queue
+  *                    when a hw controller is available.
+  */
+ struct nand_hw_control {
+       spinlock_t lock;
+       struct nand_chip *active;
+       wait_queue_head_t wq;
+ };
+ static inline void nand_hw_control_init(struct nand_hw_control *nfc)
+ {
+       nfc->active = NULL;
+       spin_lock_init(&nfc->lock);
+       init_waitqueue_head(&nfc->wq);
+ }
+ /**
+  * struct nand_ecc_step_info - ECC step information of ECC engine
+  * @stepsize: data bytes per ECC step
+  * @strengths: array of supported strengths
+  * @nstrengths: number of supported strengths
+  */
+ struct nand_ecc_step_info {
+       int stepsize;
+       const int *strengths;
+       int nstrengths;
+ };
+ /**
+  * struct nand_ecc_caps - capability of ECC engine
+  * @stepinfos: array of ECC step information
+  * @nstepinfos: number of ECC step information
+  * @calc_ecc_bytes: driver's hook to calculate ECC bytes per step
+  */
+ struct nand_ecc_caps {
+       const struct nand_ecc_step_info *stepinfos;
+       int nstepinfos;
+       int (*calc_ecc_bytes)(int step_size, int strength);
+ };
+ /* a shorthand to generate struct nand_ecc_caps with only one ECC stepsize */
+ #define NAND_ECC_CAPS_SINGLE(__name, __calc, __step, ...)     \
+ static const int __name##_strengths[] = { __VA_ARGS__ };      \
+ static const struct nand_ecc_step_info __name##_stepinfo = {  \
+       .stepsize = __step,                                     \
+       .strengths = __name##_strengths,                        \
+       .nstrengths = ARRAY_SIZE(__name##_strengths),           \
+ };                                                            \
+ static const struct nand_ecc_caps __name = {                  \
+       .stepinfos = &__name##_stepinfo,                        \
+       .nstepinfos = 1,                                        \
+       .calc_ecc_bytes = __calc,                               \
+ }
+ /**
+  * struct nand_ecc_ctrl - Control structure for ECC
+  * @mode:     ECC mode
+  * @algo:     ECC algorithm
+  * @steps:    number of ECC steps per page
+  * @size:     data bytes per ECC step
+  * @bytes:    ECC bytes per step
+  * @strength: max number of correctible bits per ECC step
+  * @total:    total number of ECC bytes per page
+  * @prepad:   padding information for syndrome based ECC generators
+  * @postpad:  padding information for syndrome based ECC generators
+  * @options:  ECC specific options (see NAND_ECC_XXX flags defined above)
+  * @priv:     pointer to private ECC control data
+  * @hwctl:    function to control hardware ECC generator. Must only
+  *            be provided if an hardware ECC is available
+  * @calculate:        function for ECC calculation or readback from ECC hardware
+  * @correct:  function for ECC correction, matching to ECC generator (sw/hw).
+  *            Should return a positive number representing the number of
+  *            corrected bitflips, -EBADMSG if the number of bitflips exceed
+  *            ECC strength, or any other error code if the error is not
+  *            directly related to correction.
+  *            If -EBADMSG is returned the input buffers should be left
+  *            untouched.
+  * @read_page_raw:    function to read a raw page without ECC. This function
+  *                    should hide the specific layout used by the ECC
+  *                    controller and always return contiguous in-band and
+  *                    out-of-band data even if they're not stored
+  *                    contiguously on the NAND chip (e.g.
+  *                    NAND_ECC_HW_SYNDROME interleaves in-band and
+  *                    out-of-band data).
+  * @write_page_raw:   function to write a raw page without ECC. This function
+  *                    should hide the specific layout used by the ECC
+  *                    controller and consider the passed data as contiguous
+  *                    in-band and out-of-band data. ECC controller is
+  *                    responsible for doing the appropriate transformations
+  *                    to adapt to its specific layout (e.g.
+  *                    NAND_ECC_HW_SYNDROME interleaves in-band and
+  *                    out-of-band data).
+  * @read_page:        function to read a page according to the ECC generator
+  *            requirements; returns maximum number of bitflips corrected in
+  *            any single ECC step, -EIO hw error
+  * @read_subpage:     function to read parts of the page covered by ECC;
+  *                    returns same as read_page()
+  * @write_subpage:    function to write parts of the page covered by ECC.
+  * @write_page:       function to write a page according to the ECC generator
+  *            requirements.
+  * @write_oob_raw:    function to write chip OOB data without ECC
+  * @read_oob_raw:     function to read chip OOB data without ECC
+  * @read_oob: function to read chip OOB data
+  * @write_oob:        function to write chip OOB data
+  */
+ struct nand_ecc_ctrl {
+       nand_ecc_modes_t mode;
+       enum nand_ecc_algo algo;
+       int steps;
+       int size;
+       int bytes;
+       int total;
+       int strength;
+       int prepad;
+       int postpad;
+       unsigned int options;
+       void *priv;
+       void (*hwctl)(struct mtd_info *mtd, int mode);
+       int (*calculate)(struct mtd_info *mtd, const uint8_t *dat,
+                       uint8_t *ecc_code);
+       int (*correct)(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc,
+                       uint8_t *calc_ecc);
+       int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
+                       uint8_t *buf, int oob_required, int page);
+       int (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
+                       const uint8_t *buf, int oob_required, int page);
+       int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip,
+                       uint8_t *buf, int oob_required, int page);
+       int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip,
+                       uint32_t offs, uint32_t len, uint8_t *buf, int page);
+       int (*write_subpage)(struct mtd_info *mtd, struct nand_chip *chip,
+                       uint32_t offset, uint32_t data_len,
+                       const uint8_t *data_buf, int oob_required, int page);
+       int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
+                       const uint8_t *buf, int oob_required, int page);
+       int (*write_oob_raw)(struct mtd_info *mtd, struct nand_chip *chip,
+                       int page);
+       int (*read_oob_raw)(struct mtd_info *mtd, struct nand_chip *chip,
+                       int page);
+       int (*read_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page);
+       int (*write_oob)(struct mtd_info *mtd, struct nand_chip *chip,
+                       int page);
+ };
+ static inline int nand_standard_page_accessors(struct nand_ecc_ctrl *ecc)
+ {
+       return !(ecc->options & NAND_ECC_CUSTOM_PAGE_ACCESS);
+ }
+ /**
+  * struct nand_buffers - buffer structure for read/write
+  * @ecccalc:  buffer pointer for calculated ECC, size is oobsize.
+  * @ecccode:  buffer pointer for ECC read from flash, size is oobsize.
+  * @databuf:  buffer pointer for data, size is (page size + oobsize).
+  *
+  * Do not change the order of buffers. databuf and oobrbuf must be in
+  * consecutive order.
+  */
+ struct nand_buffers {
+       uint8_t *ecccalc;
+       uint8_t *ecccode;
+       uint8_t *databuf;
+ };
+ /**
+  * struct nand_sdr_timings - SDR NAND chip timings
+  *
+  * This struct defines the timing requirements of a SDR NAND chip.
+  * These information can be found in every NAND datasheets and the timings
+  * meaning are described in the ONFI specifications:
+  * www.onfi.org/~/media/ONFI/specs/onfi_3_1_spec.pdf (chapter 4.15 Timing
+  * Parameters)
+  *
+  * All these timings are expressed in picoseconds.
+  *
+  * @tBERS_max: Block erase time
+  * @tCCS_min: Change column setup time
+  * @tPROG_max: Page program time
+  * @tR_max: Page read time
+  * @tALH_min: ALE hold time
+  * @tADL_min: ALE to data loading time
+  * @tALS_min: ALE setup time
+  * @tAR_min: ALE to RE# delay
+  * @tCEA_max: CE# access time
+  * @tCEH_min: CE# high hold time
+  * @tCH_min:  CE# hold time
+  * @tCHZ_max: CE# high to output hi-Z
+  * @tCLH_min: CLE hold time
+  * @tCLR_min: CLE to RE# delay
+  * @tCLS_min: CLE setup time
+  * @tCOH_min: CE# high to output hold
+  * @tCS_min: CE# setup time
+  * @tDH_min: Data hold time
+  * @tDS_min: Data setup time
+  * @tFEAT_max: Busy time for Set Features and Get Features
+  * @tIR_min: Output hi-Z to RE# low
+  * @tITC_max: Interface and Timing Mode Change time
+  * @tRC_min: RE# cycle time
+  * @tREA_max: RE# access time
+  * @tREH_min: RE# high hold time
+  * @tRHOH_min: RE# high to output hold
+  * @tRHW_min: RE# high to WE# low
+  * @tRHZ_max: RE# high to output hi-Z
+  * @tRLOH_min: RE# low to output hold
+  * @tRP_min: RE# pulse width
+  * @tRR_min: Ready to RE# low (data only)
+  * @tRST_max: Device reset time, measured from the falling edge of R/B# to the
+  *          rising edge of R/B#.
+  * @tWB_max: WE# high to SR[6] low
+  * @tWC_min: WE# cycle time
+  * @tWH_min: WE# high hold time
+  * @tWHR_min: WE# high to RE# low
+  * @tWP_min: WE# pulse width
+  * @tWW_min: WP# transition to WE# low
+  */
+ struct nand_sdr_timings {
 -      u32 tPROG_max;
 -      u32 tR_max;
++      u64 tBERS_max;
+       u32 tCCS_min;
++      u64 tPROG_max;
++      u64 tR_max;
+       u32 tALH_min;
+       u32 tADL_min;
+       u32 tALS_min;
+       u32 tAR_min;
+       u32 tCEA_max;
+       u32 tCEH_min;
+       u32 tCH_min;
+       u32 tCHZ_max;
+       u32 tCLH_min;
+       u32 tCLR_min;
+       u32 tCLS_min;
+       u32 tCOH_min;
+       u32 tCS_min;
+       u32 tDH_min;
+       u32 tDS_min;
+       u32 tFEAT_max;
+       u32 tIR_min;
+       u32 tITC_max;
+       u32 tRC_min;
+       u32 tREA_max;
+       u32 tREH_min;
+       u32 tRHOH_min;
+       u32 tRHW_min;
+       u32 tRHZ_max;
+       u32 tRLOH_min;
+       u32 tRP_min;
+       u32 tRR_min;
+       u64 tRST_max;
+       u32 tWB_max;
+       u32 tWC_min;
+       u32 tWH_min;
+       u32 tWHR_min;
+       u32 tWP_min;
+       u32 tWW_min;
+ };
+ /**
+  * enum nand_data_interface_type - NAND interface timing type
+  * @NAND_SDR_IFACE:   Single Data Rate interface
+  */
+ enum nand_data_interface_type {
+       NAND_SDR_IFACE,
+ };
+ /**
+  * struct nand_data_interface - NAND interface timing
+  * @type:     type of the timing
+  * @timings:  The timing, type according to @type
+  */
+ struct nand_data_interface {
+       enum nand_data_interface_type type;
+       union {
+               struct nand_sdr_timings sdr;
+       } timings;
+ };
+ /**
+  * nand_get_sdr_timings - get SDR timing from data interface
+  * @conf:     The data interface
+  */
+ static inline const struct nand_sdr_timings *
+ nand_get_sdr_timings(const struct nand_data_interface *conf)
+ {
+       if (conf->type != NAND_SDR_IFACE)
+               return ERR_PTR(-EINVAL);
+       return &conf->timings.sdr;
+ }
+ /**
+  * struct nand_manufacturer_ops - NAND Manufacturer operations
+  * @detect: detect the NAND memory organization and capabilities
+  * @init: initialize all vendor specific fields (like the ->read_retry()
+  *      implementation) if any.
+  * @cleanup: the ->init() function may have allocated resources, ->cleanup()
+  *         is here to let vendor specific code release those resources.
+  */
+ struct nand_manufacturer_ops {
+       void (*detect)(struct nand_chip *chip);
+       int (*init)(struct nand_chip *chip);
+       void (*cleanup)(struct nand_chip *chip);
+ };
+ /**
+  * struct nand_chip - NAND Private Flash Chip Data
+  * @mtd:              MTD device registered to the MTD framework
+  * @IO_ADDR_R:                [BOARDSPECIFIC] address to read the 8 I/O lines of the
+  *                    flash device
+  * @IO_ADDR_W:                [BOARDSPECIFIC] address to write the 8 I/O lines of the
+  *                    flash device.
+  * @read_byte:                [REPLACEABLE] read one byte from the chip
+  * @read_word:                [REPLACEABLE] read one word from the chip
+  * @write_byte:               [REPLACEABLE] write a single byte to the chip on the
+  *                    low 8 I/O lines
+  * @write_buf:                [REPLACEABLE] write data from the buffer to the chip
+  * @read_buf:         [REPLACEABLE] read data from the chip into the buffer
+  * @select_chip:      [REPLACEABLE] select chip nr
+  * @block_bad:                [REPLACEABLE] check if a block is bad, using OOB markers
+  * @block_markbad:    [REPLACEABLE] mark a block bad
+  * @cmd_ctrl:         [BOARDSPECIFIC] hardwarespecific function for controlling
+  *                    ALE/CLE/nCE. Also used to write command and address
+  * @dev_ready:                [BOARDSPECIFIC] hardwarespecific function for accessing
+  *                    device ready/busy line. If set to NULL no access to
+  *                    ready/busy is available and the ready/busy information
+  *                    is read from the chip status register.
+  * @cmdfunc:          [REPLACEABLE] hardwarespecific function for writing
+  *                    commands to the chip.
+  * @waitfunc:         [REPLACEABLE] hardwarespecific function for wait on
+  *                    ready.
+  * @setup_read_retry: [FLASHSPECIFIC] flash (vendor) specific function for
+  *                    setting the read-retry mode. Mostly needed for MLC NAND.
+  * @ecc:              [BOARDSPECIFIC] ECC control structure
+  * @buffers:          buffer structure for read/write
+  * @buf_align:                minimum buffer alignment required by a platform
+  * @hwcontrol:                platform-specific hardware control structure
+  * @erase:            [REPLACEABLE] erase function
+  * @scan_bbt:         [REPLACEABLE] function to scan bad block table
+  * @chip_delay:               [BOARDSPECIFIC] chip dependent delay for transferring
+  *                    data from array to read regs (tR).
+  * @state:            [INTERN] the current state of the NAND device
+  * @oob_poi:          "poison value buffer," used for laying out OOB data
+  *                    before writing
+  * @page_shift:               [INTERN] number of address bits in a page (column
+  *                    address bits).
+  * @phys_erase_shift: [INTERN] number of address bits in a physical eraseblock
+  * @bbt_erase_shift:  [INTERN] number of address bits in a bbt entry
+  * @chip_shift:               [INTERN] number of address bits in one chip
+  * @options:          [BOARDSPECIFIC] various chip options. They can partly
+  *                    be set to inform nand_scan about special functionality.
+  *                    See the defines for further explanation.
+  * @bbt_options:      [INTERN] bad block specific options. All options used
+  *                    here must come from bbm.h. By default, these options
+  *                    will be copied to the appropriate nand_bbt_descr's.
+  * @badblockpos:      [INTERN] position of the bad block marker in the oob
+  *                    area.
+  * @badblockbits:     [INTERN] minimum number of set bits in a good block's
+  *                    bad block marker position; i.e., BBM == 11110111b is
+  *                    not bad when badblockbits == 7
+  * @bits_per_cell:    [INTERN] number of bits per cell. i.e., 1 means SLC.
+  * @ecc_strength_ds:  [INTERN] ECC correctability from the datasheet.
+  *                    Minimum amount of bit errors per @ecc_step_ds guaranteed
+  *                    to be correctable. If unknown, set to zero.
+  * @ecc_step_ds:      [INTERN] ECC step required by the @ecc_strength_ds,
+  *                    also from the datasheet. It is the recommended ECC step
+  *                    size, if known; if unknown, set to zero.
+  * @onfi_timing_mode_default: [INTERN] default ONFI timing mode. This field is
+  *                          set to the actually used ONFI mode if the chip is
+  *                          ONFI compliant or deduced from the datasheet if
+  *                          the NAND chip is not ONFI compliant.
+  * @numchips:         [INTERN] number of physical chips
+  * @chipsize:         [INTERN] the size of one chip for multichip arrays
+  * @pagemask:         [INTERN] page number mask = number of (pages / chip) - 1
+  * @pagebuf:          [INTERN] holds the pagenumber which is currently in
+  *                    data_buf.
+  * @pagebuf_bitflips: [INTERN] holds the bitflip count for the page which is
+  *                    currently in data_buf.
+  * @subpagesize:      [INTERN] holds the subpagesize
+  * @id:                       [INTERN] holds NAND ID
+  * @onfi_version:     [INTERN] holds the chip ONFI version (BCD encoded),
+  *                    non 0 if ONFI supported.
+  * @jedec_version:    [INTERN] holds the chip JEDEC version (BCD encoded),
+  *                    non 0 if JEDEC supported.
+  * @onfi_params:      [INTERN] holds the ONFI page parameter when ONFI is
+  *                    supported, 0 otherwise.
+  * @jedec_params:     [INTERN] holds the JEDEC parameter page when JEDEC is
+  *                    supported, 0 otherwise.
+  * @max_bb_per_die:   [INTERN] the max number of bad blocks each die of a
+  *                    this nand device will encounter their life times.
+  * @blocks_per_die:   [INTERN] The number of PEBs in a die
+  * @data_interface:   [INTERN] NAND interface timing information
+  * @read_retries:     [INTERN] the number of read retry modes supported
+  * @onfi_set_features:        [REPLACEABLE] set the features for ONFI nand
+  * @onfi_get_features:        [REPLACEABLE] get the features for ONFI nand
+  * @setup_data_interface: [OPTIONAL] setup the data interface and timing. If
+  *                      chipnr is set to %NAND_DATA_IFACE_CHECK_ONLY this
+  *                      means the configuration should not be applied but
+  *                      only checked.
+  * @bbt:              [INTERN] bad block table pointer
+  * @bbt_td:           [REPLACEABLE] bad block table descriptor for flash
+  *                    lookup.
+  * @bbt_md:           [REPLACEABLE] bad block table mirror descriptor
+  * @badblock_pattern: [REPLACEABLE] bad block scan pattern used for initial
+  *                    bad block scan.
+  * @controller:               [REPLACEABLE] a pointer to a hardware controller
+  *                    structure which is shared among multiple independent
+  *                    devices.
+  * @priv:             [OPTIONAL] pointer to private chip data
+  * @manufacturer:     [INTERN] Contains manufacturer information
+  */
+ struct nand_chip {
+       struct mtd_info mtd;
+       void __iomem *IO_ADDR_R;
+       void __iomem *IO_ADDR_W;
+       uint8_t (*read_byte)(struct mtd_info *mtd);
+       u16 (*read_word)(struct mtd_info *mtd);
+       void (*write_byte)(struct mtd_info *mtd, uint8_t byte);
+       void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
+       void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
+       void (*select_chip)(struct mtd_info *mtd, int chip);
+       int (*block_bad)(struct mtd_info *mtd, loff_t ofs);
+       int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);
+       void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl);
+       int (*dev_ready)(struct mtd_info *mtd);
+       void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column,
+                       int page_addr);
+       int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);
+       int (*erase)(struct mtd_info *mtd, int page);
+       int (*scan_bbt)(struct mtd_info *mtd);
+       int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip,
+                       int feature_addr, uint8_t *subfeature_para);
+       int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,
+                       int feature_addr, uint8_t *subfeature_para);
+       int (*setup_read_retry)(struct mtd_info *mtd, int retry_mode);
+       int (*setup_data_interface)(struct mtd_info *mtd, int chipnr,
+                                   const struct nand_data_interface *conf);
+       int chip_delay;
+       unsigned int options;
+       unsigned int bbt_options;
+       int page_shift;
+       int phys_erase_shift;
+       int bbt_erase_shift;
+       int chip_shift;
+       int numchips;
+       uint64_t chipsize;
+       int pagemask;
+       int pagebuf;
+       unsigned int pagebuf_bitflips;
+       int subpagesize;
+       uint8_t bits_per_cell;
+       uint16_t ecc_strength_ds;
+       uint16_t ecc_step_ds;
+       int onfi_timing_mode_default;
+       int badblockpos;
+       int badblockbits;
+       struct nand_id id;
+       int onfi_version;
+       int jedec_version;
+       union {
+               struct nand_onfi_params onfi_params;
+               struct nand_jedec_params jedec_params;
+       };
+       u16 max_bb_per_die;
+       u32 blocks_per_die;
+       struct nand_data_interface *data_interface;
+       int read_retries;
+       flstate_t state;
+       uint8_t *oob_poi;
+       struct nand_hw_control *controller;
+       struct nand_ecc_ctrl ecc;
+       struct nand_buffers *buffers;
+       unsigned long buf_align;
+       struct nand_hw_control hwcontrol;
+       uint8_t *bbt;
+       struct nand_bbt_descr *bbt_td;
+       struct nand_bbt_descr *bbt_md;
+       struct nand_bbt_descr *badblock_pattern;
+       void *priv;
+       struct {
+               const struct nand_manufacturer *desc;
+               void *priv;
+       } manufacturer;
+ };
+ extern const struct mtd_ooblayout_ops nand_ooblayout_sp_ops;
+ extern const struct mtd_ooblayout_ops nand_ooblayout_lp_ops;
+ static inline void nand_set_flash_node(struct nand_chip *chip,
+                                      struct device_node *np)
+ {
+       mtd_set_of_node(&chip->mtd, np);
+ }
+ static inline struct device_node *nand_get_flash_node(struct nand_chip *chip)
+ {
+       return mtd_get_of_node(&chip->mtd);
+ }
+ static inline struct nand_chip *mtd_to_nand(struct mtd_info *mtd)
+ {
+       return container_of(mtd, struct nand_chip, mtd);
+ }
+ static inline struct mtd_info *nand_to_mtd(struct nand_chip *chip)
+ {
+       return &chip->mtd;
+ }
+ static inline void *nand_get_controller_data(struct nand_chip *chip)
+ {
+       return chip->priv;
+ }
+ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv)
+ {
+       chip->priv = priv;
+ }
+ static inline void nand_set_manufacturer_data(struct nand_chip *chip,
+                                             void *priv)
+ {
+       chip->manufacturer.priv = priv;
+ }
+ static inline void *nand_get_manufacturer_data(struct nand_chip *chip)
+ {
+       return chip->manufacturer.priv;
+ }
+ /*
+  * NAND Flash Manufacturer ID Codes
+  */
+ #define NAND_MFR_TOSHIBA      0x98
+ #define NAND_MFR_ESMT         0xc8
+ #define NAND_MFR_SAMSUNG      0xec
+ #define NAND_MFR_FUJITSU      0x04
+ #define NAND_MFR_NATIONAL     0x8f
+ #define NAND_MFR_RENESAS      0x07
+ #define NAND_MFR_STMICRO      0x20
+ #define NAND_MFR_HYNIX                0xad
+ #define NAND_MFR_MICRON               0x2c
+ #define NAND_MFR_AMD          0x01
+ #define NAND_MFR_MACRONIX     0xc2
+ #define NAND_MFR_EON          0x92
+ #define NAND_MFR_SANDISK      0x45
+ #define NAND_MFR_INTEL                0x89
+ #define NAND_MFR_ATO          0x9b
+ #define NAND_MFR_WINBOND      0xef
+ /*
+  * A helper for defining older NAND chips where the second ID byte fully
+  * defined the chip, including the geometry (chip size, eraseblock size, page
+  * size). All these chips have 512 bytes NAND page size.
+  */
+ #define LEGACY_ID_NAND(nm, devid, chipsz, erasesz, opts)          \
+       { .name = (nm), {{ .dev_id = (devid) }}, .pagesize = 512, \
+         .chipsize = (chipsz), .erasesize = (erasesz), .options = (opts) }
+ /*
+  * A helper for defining newer chips which report their page size and
+  * eraseblock size via the extended ID bytes.
+  *
+  * The real difference between LEGACY_ID_NAND and EXTENDED_ID_NAND is that with
+  * EXTENDED_ID_NAND, manufacturers overloaded the same device ID so that the
+  * device ID now only represented a particular total chip size (and voltage,
+  * buswidth), and the page size, eraseblock size, and OOB size could vary while
+  * using the same device ID.
+  */
+ #define EXTENDED_ID_NAND(nm, devid, chipsz, opts)                      \
+       { .name = (nm), {{ .dev_id = (devid) }}, .chipsize = (chipsz), \
+         .options = (opts) }
+ #define NAND_ECC_INFO(_strength, _step)       \
+                       { .strength_ds = (_strength), .step_ds = (_step) }
+ #define NAND_ECC_STRENGTH(type)               ((type)->ecc.strength_ds)
+ #define NAND_ECC_STEP(type)           ((type)->ecc.step_ds)
+ /**
+  * struct nand_flash_dev - NAND Flash Device ID Structure
+  * @name: a human-readable name of the NAND chip
+  * @dev_id: the device ID (the second byte of the full chip ID array)
+  * @mfr_id: manufecturer ID part of the full chip ID array (refers the same
+  *          memory address as @id[0])
+  * @dev_id: device ID part of the full chip ID array (refers the same memory
+  *          address as @id[1])
+  * @id: full device ID array
+  * @pagesize: size of the NAND page in bytes; if 0, then the real page size (as
+  *            well as the eraseblock size) is determined from the extended NAND
+  *            chip ID array)
+  * @chipsize: total chip size in MiB
+  * @erasesize: eraseblock size in bytes (determined from the extended ID if 0)
+  * @options: stores various chip bit options
+  * @id_len: The valid length of the @id.
+  * @oobsize: OOB size
+  * @ecc: ECC correctability and step information from the datasheet.
+  * @ecc.strength_ds: The ECC correctability from the datasheet, same as the
+  *                   @ecc_strength_ds in nand_chip{}.
+  * @ecc.step_ds: The ECC step required by the @ecc.strength_ds, same as the
+  *               @ecc_step_ds in nand_chip{}, also from the datasheet.
+  *               For example, the "4bit ECC for each 512Byte" can be set with
+  *               NAND_ECC_INFO(4, 512).
+  * @onfi_timing_mode_default: the default ONFI timing mode entered after a NAND
+  *                          reset. Should be deduced from timings described
+  *                          in the datasheet.
+  *
+  */
+ struct nand_flash_dev {
+       char *name;
+       union {
+               struct {
+                       uint8_t mfr_id;
+                       uint8_t dev_id;
+               };
+               uint8_t id[NAND_MAX_ID_LEN];
+       };
+       unsigned int pagesize;
+       unsigned int chipsize;
+       unsigned int erasesize;
+       unsigned int options;
+       uint16_t id_len;
+       uint16_t oobsize;
+       struct {
+               uint16_t strength_ds;
+               uint16_t step_ds;
+       } ecc;
+       int onfi_timing_mode_default;
+ };
+ /**
+  * struct nand_manufacturer - NAND Flash Manufacturer structure
+  * @name:     Manufacturer name
+  * @id:               manufacturer ID code of device.
+  * @ops:      manufacturer operations
+ */
+ struct nand_manufacturer {
+       int id;
+       char *name;
+       const struct nand_manufacturer_ops *ops;
+ };
+ const struct nand_manufacturer *nand_get_manufacturer(u8 id);
+ static inline const char *
+ nand_manufacturer_name(const struct nand_manufacturer *manufacturer)
+ {
+       return manufacturer ? manufacturer->name : "Unknown";
+ }
+ extern struct nand_flash_dev nand_flash_ids[];
+ extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;
+ extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;
+ extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;
+ extern const struct nand_manufacturer_ops micron_nand_manuf_ops;
+ extern const struct nand_manufacturer_ops amd_nand_manuf_ops;
+ extern const struct nand_manufacturer_ops macronix_nand_manuf_ops;
+ int nand_default_bbt(struct mtd_info *mtd);
+ int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);
+ int nand_isreserved_bbt(struct mtd_info *mtd, loff_t offs);
+ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt);
+ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
+                   int allowbbt);
+ int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
+                size_t *retlen, uint8_t *buf);
+ /**
+  * struct platform_nand_chip - chip level device structure
+  * @nr_chips:         max. number of chips to scan for
+  * @chip_offset:      chip number offset
+  * @nr_partitions:    number of partitions pointed to by partitions (or zero)
+  * @partitions:               mtd partition list
+  * @chip_delay:               R/B delay value in us
+  * @options:          Option flags, e.g. 16bit buswidth
+  * @bbt_options:      BBT option flags, e.g. NAND_BBT_USE_FLASH
+  * @part_probe_types: NULL-terminated array of probe types
+  */
+ struct platform_nand_chip {
+       int nr_chips;
+       int chip_offset;
+       int nr_partitions;
+       struct mtd_partition *partitions;
+       int chip_delay;
+       unsigned int options;
+       unsigned int bbt_options;
+       const char **part_probe_types;
+ };
+ /* Keep gcc happy */
+ struct platform_device;
+ /**
+  * struct platform_nand_ctrl - controller level device structure
+  * @probe:            platform specific function to probe/setup hardware
+  * @remove:           platform specific function to remove/teardown hardware
+  * @hwcontrol:                platform specific hardware control structure
+  * @dev_ready:                platform specific function to read ready/busy pin
+  * @select_chip:      platform specific chip select function
+  * @cmd_ctrl:         platform specific function for controlling
+  *                    ALE/CLE/nCE. Also used to write command and address
+  * @write_buf:                platform specific function for write buffer
+  * @read_buf:         platform specific function for read buffer
+  * @read_byte:                platform specific function to read one byte from chip
+  * @priv:             private data to transport driver specific settings
+  *
+  * All fields are optional and depend on the hardware driver requirements
+  */
+ struct platform_nand_ctrl {
+       int (*probe)(struct platform_device *pdev);
+       void (*remove)(struct platform_device *pdev);
+       void (*hwcontrol)(struct mtd_info *mtd, int cmd);
+       int (*dev_ready)(struct mtd_info *mtd);
+       void (*select_chip)(struct mtd_info *mtd, int chip);
+       void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl);
+       void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
+       void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
+       unsigned char (*read_byte)(struct mtd_info *mtd);
+       void *priv;
+ };
+ /**
+  * struct platform_nand_data - container structure for platform-specific data
+  * @chip:             chip level chip structure
+  * @ctrl:             controller level device structure
+  */
+ struct platform_nand_data {
+       struct platform_nand_chip chip;
+       struct platform_nand_ctrl ctrl;
+ };
+ /* return the supported features. */
+ static inline int onfi_feature(struct nand_chip *chip)
+ {
+       return chip->onfi_version ? le16_to_cpu(chip->onfi_params.features) : 0;
+ }
+ /* return the supported asynchronous timing mode. */
+ static inline int onfi_get_async_timing_mode(struct nand_chip *chip)
+ {
+       if (!chip->onfi_version)
+               return ONFI_TIMING_MODE_UNKNOWN;
+       return le16_to_cpu(chip->onfi_params.async_timing_mode);
+ }
+ /* return the supported synchronous timing mode. */
+ static inline int onfi_get_sync_timing_mode(struct nand_chip *chip)
+ {
+       if (!chip->onfi_version)
+               return ONFI_TIMING_MODE_UNKNOWN;
+       return le16_to_cpu(chip->onfi_params.src_sync_timing_mode);
+ }
+ int onfi_init_data_interface(struct nand_chip *chip,
+                            struct nand_data_interface *iface,
+                            enum nand_data_interface_type type,
+                            int timing_mode);
+ /*
+  * Check if it is a SLC nand.
+  * The !nand_is_slc() can be used to check the MLC/TLC nand chips.
+  * We do not distinguish the MLC and TLC now.
+  */
+ static inline bool nand_is_slc(struct nand_chip *chip)
+ {
+       WARN(chip->bits_per_cell == 0,
+            "chip->bits_per_cell is used uninitialized\n");
+       return chip->bits_per_cell == 1;
+ }
+ /**
+  * Check if the opcode's address should be sent only on the lower 8 bits
+  * @command: opcode to check
+  */
+ static inline int nand_opcode_8bits(unsigned int command)
+ {
+       switch (command) {
+       case NAND_CMD_READID:
+       case NAND_CMD_PARAM:
+       case NAND_CMD_GET_FEATURES:
+       case NAND_CMD_SET_FEATURES:
+               return 1;
+       default:
+               break;
+       }
+       return 0;
+ }
+ /* return the supported JEDEC features. */
+ static inline int jedec_feature(struct nand_chip *chip)
+ {
+       return chip->jedec_version ? le16_to_cpu(chip->jedec_params.features)
+               : 0;
+ }
+ /* get timing characteristics from ONFI timing mode. */
+ const struct nand_sdr_timings *onfi_async_timing_mode_to_sdr_timings(int mode);
+ /* get data interface from ONFI timing mode 0, used after reset. */
+ const struct nand_data_interface *nand_get_default_data_interface(void);
+ int nand_check_erased_ecc_chunk(void *data, int datalen,
+                               void *ecc, int ecclen,
+                               void *extraoob, int extraooblen,
+                               int threshold);
+ int nand_check_ecc_caps(struct nand_chip *chip,
+                       const struct nand_ecc_caps *caps, int oobavail);
+ int nand_match_ecc_req(struct nand_chip *chip,
+                      const struct nand_ecc_caps *caps,  int oobavail);
+ int nand_maximize_ecc(struct nand_chip *chip,
+                     const struct nand_ecc_caps *caps, int oobavail);
+ /* Default write_oob implementation */
+ int nand_write_oob_std(struct mtd_info *mtd, struct nand_chip *chip, int page);
+ /* Default write_oob syndrome implementation */
+ int nand_write_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
+                           int page);
+ /* Default read_oob implementation */
+ int nand_read_oob_std(struct mtd_info *mtd, struct nand_chip *chip, int page);
+ /* Default read_oob syndrome implementation */
+ int nand_read_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
+                          int page);
+ /* Stub used by drivers that do not support GET/SET FEATURES operations */
+ int nand_onfi_get_set_features_notsupp(struct mtd_info *mtd,
+                                      struct nand_chip *chip, int addr,
+                                      u8 *subfeature_param);
+ /* Default read_page_raw implementation */
+ int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                      uint8_t *buf, int oob_required, int page);
+ /* Default write_page_raw implementation */
+ int nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                       const uint8_t *buf, int oob_required, int page);
+ /* Reset and initialize a NAND device */
+ int nand_reset(struct nand_chip *chip, int chipnr);
+ /* Free resources held by the NAND device */
+ void nand_cleanup(struct nand_chip *chip);
+ /* Default extended ID decoding function */
+ void nand_decode_ext_id(struct nand_chip *chip);
+ #endif /* __LINUX_MTD_RAWNAND_H */
This page took 0.479595 seconds and 4 git commands to generate.