Merge tag 'for-linus-20170904' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Sep 2017 21:48:21 +0000 (14:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Sep 2017 21:48:21 +0000 (14:48 -0700)
Pull MTD updates from Boris Brezillon:
 "General updates:
   - Constify pci_device_id in various drivers
   - Constify device_type
   - Remove pad control code from the Gemini driver
   - Use %pOF to print OF node full_name
   - Various fixes in the physmap_of driver
   - Remove unused vars in mtdswap
   - Check devm_kzalloc() return value in the spear_smi driver
   - Check clk_prepare_enable() return code in the st_spi_fsm driver
   - Create per MTD device debugfs enties

  NAND updates, from Boris Brezillon:
   - 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
   - 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

  SPI NOR updates, from Cyrille Pitchen and Marek Vasut:
   - add support to the JEDEC JESD216B specification (SFDP tables).
   - add support to the Intel Denverton SPI flash controller.
   - fix error recovery for Spansion/Cypress SPI NOR memories.
   - fix 4-byte address management for the Aspeed SPI controller.
   - add support to some Microchip SST26 memory parts
   - remove unneeded pinctrl header Write a message for tag:"

* tag 'for-linus-20170904' of git://git.infradead.org/linux-mtd: (74 commits)
  mtd: nand: complain loudly when chip->bits_per_cell is not correctly initialized
  mtd: nand: make Samsung SLC NAND usable again
  mtd: nand: tmio: Register partitions using the parsers
  mfd: tmio: Add partition parsers platform data
  mtd: nand: sharpsl: Register partitions using the parsers
  mtd: nand: sharpsl: Add partition parsers platform data
  mtd: nand: qcom: Support for IPQ8074 QPIC NAND controller
  mtd: nand: qcom: support for IPQ4019 QPIC NAND controller
  dt-bindings: qcom_nandc: IPQ8074 QPIC NAND documentation
  dt-bindings: qcom_nandc: IPQ4019 QPIC NAND documentation
  dt-bindings: qcom_nandc: fix the ipq806x device tree example
  mtd: nand: qcom: support for different DEV_CMD register offsets
  mtd: nand: qcom: QPIC data descriptors handling
  mtd: nand: qcom: enable BAM or ADM mode
  mtd: nand: qcom: erased codeword detection configuration
  mtd: nand: qcom: support for read location registers
  mtd: nand: qcom: support for passing flags in DMA helper functions
  mtd: nand: qcom: add BAM DMA descriptor handling
  mtd: nand: qcom: allocate BAM transaction
  mtd: nand: qcom: DMA mapping support for register read buffer
  ...

1  2 
MAINTAINERS
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-s3c24xx/mach-osiris.c
drivers/mtd/nand/atmel/nand-controller.c
include/asm-generic/vmlinux.lds.h
include/linux/mfd/tmio.h

diff --combined MAINTAINERS
index 24f57993d78a371ef3ea46aca7ea94de0c64154b,1c0cc17f48547151171b31d312ab6876de695956..fece49dcb0f6bd56734d145915146f7b837f3caf
@@@ -301,7 -301,6 +301,7 @@@ S: Supporte
  F:    drivers/acpi/
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
 +F:    include/linux/fwnode.h
  F:    include/acpi/
  F:    Documentation/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
@@@ -311,14 -310,6 +311,14 @@@ F:       drivers/pci/*/*acpi
  F:    drivers/pci/*/*/*acpi*
  F:    tools/power/acpi/
  
 +ACPI APEI
 +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    Len Brown <lenb@kernel.org>
 +L:    linux-acpi@vger.kernel.org
 +R:    Tony Luck <tony.luck@intel.com>
 +R:    Borislav Petkov <bp@alien8.de>
 +F:    drivers/acpi/apei/
 +
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <robert.moore@intel.com>
  M:    Lv Zheng <lv.zheng@intel.com>
@@@ -778,12 -769,6 +778,12 @@@ W:       http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/media/i2c/adv7180.c
  
 +ANALOG DEVICES INC ADV748X DRIVER
 +M:    Kieran Bingham <kieran.bingham@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/adv748x/*
 +
  ANALOG DEVICES INC ADV7511 DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -1168,7 -1153,6 +1168,7 @@@ L:      linux-arm-kernel@axis.co
  F:    arch/arm/mach-artpec
  F:    arch/arm/boot/dts/artpec6*
  F:    drivers/clk/axis
 +F:    drivers/crypto/axis
  F:    drivers/pinctrl/pinctrl-artpec*
  F:    Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
  
@@@ -1298,15 -1282,10 +1298,15 @@@ S:   Maintaine
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Hans Ulli Kroll <ulli.kroll@googlemail.com>
 +M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/ulli-kroll/linux.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/gemini.txt
 +F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 +F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
@@@ -1591,7 -1570,7 +1591,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/phy/phy-mt65xx-usb3.c
 +F:    drivers/phy/mediatek/phy-mtk-tphy.c
  
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <gerg@uclinux.org>
@@@ -2014,7 -1993,6 +2014,7 @@@ F:      arch/arm64/boot/dts/socionext
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
  F:    drivers/i2c/busses/i2c-uniphier*
 +F:    drivers/irqchip/irq-uniphier-aidet.c
  F:    drivers/pinctrl/uniphier/
  F:    drivers/reset/reset-uniphier.c
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -2139,12 -2117,6 +2139,12 @@@ S:    Maintaine
  F:    arch/arm64/
  F:    Documentation/arm64/
  
 +AS3645A LED FLASH CONTROLLER DRIVER
 +M:    Sakari Ailus <sakari.ailus@iki.fi>
 +L:    linux-leds@vger.kernel.org
 +S:    Maintained
 +F:    drivers/leds/leds-as3645a.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -2413,10 -2385,9 +2413,10 @@@ AUDIT SUBSYSTE
  M:    Paul Moore <paul@paul-moore.com>
  M:    Eric Paris <eparis@redhat.com>
  L:    linux-audit@redhat.com (moderated for non-subscribers)
 -W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.infradead.org/users/pcmoore/audit
 -S:    Maintained
 +W:    https://github.com/linux-audit
 +W:    https://people.redhat.com/sgrubb/audit
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
 +S:    Supported
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
@@@ -2506,7 -2477,7 +2506,7 @@@ Q:      https://patchwork.open-mesh.org/proj
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
  F:    Documentation/ABI/testing/sysfs-class-net-mesh
 -F:    Documentation/networking/batman-adv.txt
 +F:    Documentation/networking/batman-adv.rst
  F:    include/uapi/linux/batman_adv.h
  F:    net/batman-adv/
  
@@@ -2575,6 -2546,13 +2575,6 @@@ W:     http://blackfin.uclinux.or
  S:    Supported
  F:    drivers/net/ethernet/adi/
  
 -BLACKFIN I2C TWI DRIVER
 -M:    Sonic Zhang <sonic.zhang@analog.com>
 -L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-bfin-twi.c
 -
  BLACKFIN MEDIA DRIVER
  M:    Scott Jiang <scott.jiang.linux@gmail.com>
  L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
@@@ -2591,12 -2569,14 +2591,12 @@@ S:   Supporte
  F:    drivers/rtc/rtc-bfin.c
  
  BLACKFIN SDH DRIVER
 -M:    Sonic Zhang <sonic.zhang@analog.com>
  L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/mmc/host/bfin_sdh.c
  
  BLACKFIN SERIAL DRIVER
 -M:    Sonic Zhang <sonic.zhang@analog.com>
  L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -4128,9 -4108,7 +4128,9 @@@ F:      include/linux/dax.
  F:    include/trace/events/fs_dax.h
  
  DIRECTORY NOTIFICATION (DNOTIFY)
 -M:    Eric Paris <eparis@parisplace.org>
 +M:    Jan Kara <jack@suse.cz>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/dnotify.txt
  F:    fs/notify/dnotify/
@@@ -4381,12 -4359,6 +4381,12 @@@ S:    Maintaine
  F:    drivers/gpu/drm/qxl/
  F:    include/uapi/drm/qxl_drm.h
  
 +DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/repaper.c
 +F:    Documentation/devicetree/bindings/display/repaper.txt
 +
  DRM DRIVER FOR RAGE 128 VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/r128/
@@@ -4402,12 -4374,6 +4402,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/sis/
  F:    include/uapi/drm/sis_drm.h
  
 +DRM DRIVER FOR SITRONIX ST7586 PANELS
 +M:    David Lechner <david@lechnology.com>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/st7586.c
 +F:    Documentation/devicetree/bindings/display/st7586.txt
 +
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -4656,14 -4622,6 +4656,14 @@@ F:    drivers/gpu/drm/panel
  F:    include/drm/drm_panel.h
  F:    Documentation/devicetree/bindings/display/panel/
  
 +DRM TINYDRM DRIVERS
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +W:    https://github.com/notro/tinydrm/wiki/Development
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/
 +F:    include/drm/tinydrm/
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -5143,7 -5101,6 +5143,7 @@@ F:      include/linux/of_net.
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
  F:    include/linux/platform_data/mdio-gpio.h
 +F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
@@@ -5241,9 -5198,7 +5241,9 @@@ F:      Documentation/hwmon/f71805
  F:    drivers/hwmon/f71805f.c
  
  FANOTIFY
 -M:    Eric Paris <eparis@redhat.com>
 +M:    Jan Kara <jack@suse.cz>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    fs/notify/fanotify/
  F:    include/linux/fanotify.h
@@@ -5386,11 -5341,10 +5386,11 @@@ K:   fmc_d.*registe
  
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <atull@kernel.org>
 -R:    Moritz Fischer <moritz.fischer@ettus.com>
 +R:    Moritz Fischer <mdf@kernel.org>
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
 +Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
  F:    Documentation/devicetree/bindings/fpga/
  F:    drivers/fpga/
@@@ -5809,12 -5763,6 +5809,12 @@@ S:    Maintaine
  F:    Documentation/acpi/gpio-properties.txt
  F:    drivers/gpio/gpiolib-acpi.c
  
 +GPIO IR Transmitter
 +M:    Sean Young <sean@mess.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/rc/gpio-ir-tx.c
 +
  GPIO MOCKUP DRIVER
  M:    Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
  L:    linux-gpio@vger.kernel.org
@@@ -6084,6 -6032,16 +6084,6 @@@ F:     drivers/scsi/hpsa*.[ch
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
  
 -HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 -L:    linux-scsi@vger.kernel.org
 -S:    Supported
 -F:    Documentation/blockdev/cciss.txt
 -F:    drivers/block/cciss*
 -F:    include/linux/cciss_ioctl.h
 -F:    include/uapi/linux/cciss_ioctl.h
 -
  HFI1 DRIVER
  M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
  M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
@@@ -6189,14 -6147,6 +6189,14 @@@ S:    Maintaine
  F:    drivers/net/ethernet/hisilicon/
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  
 +HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
 +M:    Yisen Zhuang <yisen.zhuang@huawei.com>
 +M:    Salil Mehta <salil.mehta@huawei.com>
 +L:    netdev@vger.kernel.org
 +W:    http://www.hisilicon.com
 +S:    Maintained
 +F:    drivers/net/ethernet/hisilicon/hns3/
 +
  HISILICON ROCE DRIVER
  M:    Lijun Ou <oulijun@huawei.com>
  M:    Wei Hu(Xavier) <xavier.huwei@huawei.com>
@@@ -6281,13 -6231,6 +6281,13 @@@ L:    linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/input/touchscreen/htcpen.c
  
 +HUAWEI ETHERNET DRIVER
 +M:    Aviad Krawczyk <aviad.krawczyk@huawei.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    Documentation/networking/hinic.txt
 +F:    drivers/net/ethernet/huawei/hinic/
 +
  HUGETLB FILESYSTEM
  M:    Nadia Yvette Chambers <nyc@holomorphy.com>
  S:    Maintained
@@@ -6314,9 -6257,7 +6314,9 @@@ M:      Haiyang Zhang <haiyangz@microsoft.co
  M:    Stephen Hemminger <sthemmin@microsoft.com>
  L:    devel@linuxdriverproject.org
  S:    Maintained
 +F:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
 +F:    arch/x86/include/asm/trace/hyperv.h
  F:    arch/x86/include/uapi/asm/hyperv.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
@@@ -6328,9 -6269,7 +6328,9 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 +F:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
 +F:    include/uapi/linux/hyperv.h
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
@@@ -6432,12 -6371,6 +6432,12 @@@ F:    drivers/i2c/busses/i2c-sis96x.
  F:    drivers/i2c/busses/i2c-via.c
  F:    drivers/i2c/busses/i2c-viapro.c
  
 +I2C/SMBUS INTEL CHT WHISKEY COVE PMIC DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-cht-wc.c
 +
  I2C/SMBUS ISMT DRIVER
  M:    Seth Heasley <seth.heasley@intel.com>
  M:    Neil Horman <nhorman@tuxdriver.com>
@@@ -6504,15 -6437,6 +6504,15 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
  
 +IBM Power Virtual Accelerator Switchboard
 +M:    Sukadev Bhattiprolu
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Supported
 +F:    arch/powerpc/platforms/powernv/vas*
 +F:    arch/powerpc/platforms/powernv/copy-paste.h
 +F:    arch/powerpc/include/asm/vas.h
 +F:    arch/powerpc/include/uapi/asm/vas.h
 +
  IBM Power Virtual Ethernet Device Driver
  M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
@@@ -6749,9 -6673,9 +6749,9 @@@ S:      Maintaine
  F:    drivers/mtd/nand/jz4780_*
  
  INOTIFY
 -M:    John McCutchan <john@johnmccutchan.com>
 -M:    Robert Love <rlove@rlove.org>
 -M:    Eric Paris <eparis@parisplace.org>
 +M:    Jan Kara <jack@suse.cz>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/inotify.txt
  F:    fs/notify/inotify/
@@@ -6820,9 -6744,8 +6820,9 @@@ S:      Supporte
  F:    drivers/scsi/isci/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Daniel Vetter <daniel.vetter@intel.com>
  M:    Jani Nikula <jani.nikula@linux.intel.com>
 +M:    Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
 +M:    Rodrigo Vivi <rodrigo.vivi@intel.com>
  L:    intel-gfx@lists.freedesktop.org
  W:    https://01.org/linuxgraphics/
  B:    https://01.org/linuxgraphics/documentation/how-report-bugs
@@@ -7160,7 -7083,9 +7160,7 @@@ W:      http://irda.sourceforge.net
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
 -F:    drivers/net/irda/
 -F:    include/net/irda/
 -F:    net/irda/
 +F:    drivers/staging/irda/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <marc.zyngier@arm.com>
@@@ -7454,13 -7379,6 +7454,13 @@@ S:    Maintaine
  F:    tools/testing/selftests/
  F:    Documentation/dev-tools/kselftest*
  
 +KERNEL USERMODE HELPER
 +M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    kernel/umh.c
 +F:    include/linux/umh.h
 +
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Paolo Bonzini <pbonzini@redhat.com>
  M:    Radim Krčmář <rkrcmar@redhat.com>
@@@ -7468,30 -7386,18 +7468,30 @@@ L:   kvm@vger.kernel.or
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  S:    Supported
 -F:    Documentation/*/kvm*.txt
  F:    Documentation/virtual/kvm/
 -F:    arch/*/kvm/
 -F:    arch/x86/kernel/kvm.c
 -F:    arch/x86/kernel/kvmclock.c
 -F:    arch/*/include/asm/kvm*
 -F:    include/linux/kvm*
 +F:    include/trace/events/kvm.h
 +F:    include/uapi/asm-generic/kvm*
  F:    include/uapi/linux/kvm*
 -F:    virt/kvm/
 +F:    include/asm-generic/kvm*
 +F:    include/linux/kvm*
 +F:    include/kvm/iodev.h
 +F:    virt/kvm/*
  F:    tools/kvm/
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
 +KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 +M:    Paolo Bonzini <pbonzini@redhat.com>
 +M:    Radim KrÄmář <rkrcmar@redhat.com>
 +L:    kvm@vger.kernel.org
 +W:    http://www.linux-kvm.org
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +S:    Supported
 +F:    arch/x86/kvm/
 +F:    arch/x86/include/uapi/asm/kvm*
 +F:    arch/x86/include/asm/kvm*
 +F:    arch/x86/kernel/kvm.c
 +F:    arch/x86/kernel/kvmclock.c
 +
 +KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
  M:    Joerg Roedel <joro@8bytes.org>
  L:    kvm@vger.kernel.org
  W:    http://www.linux-kvm.org/
@@@ -7499,7 -7405,7 +7499,7 @@@ S:      Maintaine
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/kvm/svm.c
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 +KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
  M:    Christoffer Dall <christoffer.dall@linaro.org>
  M:    Marc Zyngier <marc.zyngier@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -7513,16 -7419,14 +7513,16 @@@ F:   arch/arm/kvm
  F:    virt/kvm/arm/
  F:    include/kvm/arm_*
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 +KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
  M:    Alexander Graf <agraf@suse.com>
  L:    kvm-ppc@vger.kernel.org
  W:    http://www.linux-kvm.org/
  T:    git git://github.com/agraf/linux-2.6.git
  S:    Supported
 +F:    arch/powerpc/include/uapi/asm/kvm*
  F:    arch/powerpc/include/asm/kvm*
  F:    arch/powerpc/kvm/
 +F:    arch/powerpc/kernel/kvm*
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Christoffer Dall <christoffer.dall@linaro.org>
@@@ -7549,8 -7453,7 +7549,8 @@@ L:      linux-s390@vger.kernel.or
  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/uapi/asm/kvm*
 +F:    arch/s390/include/asm/gmap.h
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/kvm/
  F:    arch/s390/mm/gmap.c
@@@ -7636,7 -7539,7 +7636,7 @@@ F:      include/linux/kmemleak.
  F:    mm/kmemleak.c
  F:    mm/kmemleak-test.c
  
 -KMOD MODULE USERMODE HELPER
 +KMOD KERNEL MODULE LOADER - USERMODE HELPER
  M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
@@@ -7736,6 -7639,17 +7736,6 @@@ T:     git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/dvb-frontends/lgdt3305.*
  
 -LGUEST
 -M:    Rusty Russell <rusty@rustcorp.com.au>
 -L:    lguest@lists.ozlabs.org
 -W:    http://lguest.ozlabs.org/
 -S:    Odd Fixes
 -F:    arch/x86/include/asm/lguest*.h
 -F:    arch/x86/lguest/
 -F:    drivers/lguest/
 -F:    include/linux/lguest*.h
 -F:    tools/lguest/
 -
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <vireshk@kernel.org>
  L:    linux-ide@vger.kernel.org
@@@ -7794,13 -7708,6 +7794,13 @@@ M:    Sasha Levin <alexander.levin@verizon
  S:    Maintained
  F:    tools/lib/lockdep/
  
 +HMM - Heterogeneous Memory Management
 +M:    Jérôme Glisse <jglisse@redhat.com>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    mm/hmm*
 +F:    include/linux/hmm*
 +
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
  M:    Ross Zwisler <ross.zwisler@linux.intel.com>
  L:    linux-nvdimm@lists.01.org
@@@ -7878,7 -7785,6 +7878,7 @@@ F:      drivers/pci/hotplug/rpa
  F:    drivers/rtc/rtc-opal.c
  F:    drivers/scsi/ibmvscsi/
  F:    drivers/tty/hvc/hvc_opal.c
 +F:    drivers/watchdog/wdrtas.c
  F:    tools/testing/selftests/powerpc
  N:    /pmac
  N:    powermac
@@@ -8436,14 -8342,6 +8436,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/lnbh25*
  
 +MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/mxl5xx*
 +
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
  M:    Sergey Kozlov <serjk@netup.ru>
  M:    Abylay Ospan <aospan@netup.ru>
@@@ -8500,30 -8398,6 +8500,30 @@@ S:    Supporte
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
  F:    drivers/media/platform/vsp1/
  
 +MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv0910*
 +
 +MEDIA DRIVERS FOR ST STV6111 TUNER ICs
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv6111*
 +
 +MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
 +M:    Daniel Scheller <d.scheller.oss@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/pci/ddbridge/*
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
@@@ -8549,9 -8423,7 +8549,9 @@@ F:      include/uapi/linux/uvcvideo.
  
  MEDIATEK ETHERNET DRIVER
  M:    Felix Fietkau <nbd@openwrt.org>
 -M:    John Crispin <blogic@openwrt.org>
 +M:    John Crispin <john@phrozen.org>
 +M:    Sean Wang <sean.wang@mediatek.com>
 +M:    Nelson Chang <nelson.chang@mediatek.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
@@@ -8587,24 -8459,11 +8587,24 @@@ L:   linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK CIR DRIVER
 +M:    Sean Wang <sean.wang@mediatek.com>
 +S:    Maintained
 +F:    drivers/media/rc/mtk-cir.c
 +
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
  M:    Sean Wang <sean.wang@mediatek.com>
  S:    Maintained
  F:    drivers/char/hw_random/mtk-rng.c
  
 +MEDIATEK USB3 DRD IP DRIVER
 +M:    Chunfeng Yun <chunfeng.yun@mediatek.com>
 +L:    linux-usb@vger.kernel.org (moderated for non-subscribers)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/usb/mtu3/
 +
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <peter.senna@collabora.com>
  M:    Martin Donnelly <martin.donnelly@ge.com>
@@@ -8769,7 -8628,7 +8769,7 @@@ M:      Mathieu Desnoyers <mathieu.desnoyers
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    kernel/membarrier.c
 +F:    kernel/sched/membarrier.c
  F:    include/uapi/linux/membarrier.h
  
  MEMORY MANAGEMENT
@@@ -8823,16 -8682,6 +8823,16 @@@ F:    drivers/leds/leds-menf21bmc.
  F:    drivers/hwmon/menf21bmc_hwmon.c
  F:    Documentation/hwmon/menf21bmc
  
 +MESON AO CEC DRIVER FOR AMLOGIC SOCS
 +M:    Neil Armstrong <narmstrong@baylibre.com>
 +L:    linux-media@lists.freedesktop.org
 +L:    linux-amlogic@lists.infradead.org
 +W:    http://linux-meson.com/
 +S:    Supported
 +F:    drivers/media/platform/meson/ao-cec.c
 +F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
 +T:    git git://linuxtv.org/media_tree.git
 +
  METAG ARCHITECTURE
  M:    James Hogan <james.hogan@imgtec.com>
  L:    linux-metag@vger.kernel.org
@@@ -8869,12 -8718,6 +8869,12 @@@ F:    drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
  
 +MICROCHIP / ATMEL ECC DRIVER
 +M:    Tudor Ambarus <tudor.ambarus@microchip.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/atmel-ecc.*
 +
  MICROCHIP / ATMEL ISC DRIVER
  M:    Songjun Wu <songjun.wu@microchip.com>
  L:    linux-media@vger.kernel.org
@@@ -9184,7 -9027,7 +9184,7 @@@ T:      git git://git.infradead.org/linux-mt
  T:    git git://git.infradead.org/l2-mtd.git nand/next
  S:    Maintained
  F:    drivers/mtd/nand/
- F:    include/linux/mtd/nand*.h
+ F:    include/linux/mtd/*nand*.h
  
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <zonque@gmail.com>
@@@ -9622,7 -9465,6 +9622,7 @@@ M:      Srinivas Kandagatla <srinivas.kandag
  S:    Maintained
  F:    drivers/nvmem/
  F:    Documentation/devicetree/bindings/nvmem/
 +F:    Documentation/ABI/stable/sysfs-bus-nvmem
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
@@@ -9866,7 -9708,7 +9866,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
 -M:    Ramiro Oliveira <roliveir@synopsys.com>
 +M:    Luis Oliveira <lolivei@synopsys.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
@@@ -10255,7 -10097,6 +10255,7 @@@ F:   drivers/pci/dwc/*imx6
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
  M:    Keith Busch <keith.busch@intel.com>
 +M:    Jonathan Derrick <jonathan.derrick@intel.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    drivers/pci/host/vmd.c
@@@ -10302,7 -10143,7 +10302,7 @@@ L:   linux-samsung-soc@vger.kernel.org (m
  S:    Maintained
  F:    drivers/pci/dwc/pci-exynos.c
  
 -PCI DRIVER FOR SYNOPSIS DESIGNWARE
 +PCI DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Jingoo Han <jingoohan1@gmail.com>
  M:    Joao Pinto <Joao.Pinto@synopsys.com>
  L:    linux-pci@vger.kernel.org
@@@ -10738,11 -10579,8 +10738,11 @@@ W: http://wiki.enneenne.com/index.php/L
  L:    linuxpps@ml.enneenne.com (subscribers-only)
  S:    Maintained
  F:    Documentation/pps/
 +F:    Documentation/devicetree/bindings/pps/pps-gpio.txt
 +F:    Documentation/ABI/testing/sysfs-pps
  F:    drivers/pps/
  F:    include/linux/pps*.h
 +F:    include/uapi/linux/pps.h
  
  PPTP DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>
@@@ -10868,7 -10706,6 +10868,7 @@@ L:   linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/pulse8-cec/*
 +F:    Documentation/media/cec-drivers/pulse8-cec.rst
  
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <isely@pobox.com>
@@@ -10896,12 -10733,6 +10896,12 @@@ F: Documentation/devicetree/bindings/hw
  F:    Documentation/hwmon/pwm-fan
  F:    drivers/hwmon/pwm-fan.c
  
 +PWM IR Transmitter
 +M:    Sean Young <sean@mess.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/rc/pwm-ir-tx.c
 +
  PWM SUBSYSTEM
  M:    Thierry Reding <thierry.reding@gmail.com>
  L:    linux-pwm@vger.kernel.org
@@@ -11096,14 -10927,6 +11096,14 @@@ W: http://wireless.kernel.org/en/users/
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
 +QUALCOMM CAMERA SUBSYSTEM DRIVER
 +M:    Todor Tomov <todor.tomov@linaro.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/qcom,camss.txt
 +F:    Documentation/media/v4l-drivers/qcom_camss.rst
 +F:    drivers/media/platform/qcom/camss-8x16/
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <timur@codeaurora.org>
  L:    netdev@vger.kernel.org
@@@ -11287,7 -11110,7 +11287,7 @@@ M:   Fenghua Yu <fenghua.yu@intel.com
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    arch/x86/kernel/cpu/intel_rdt*
 -F:    arch/x86/include/asm/intel_rdt*
 +F:    arch/x86/include/asm/intel_rdt_sched.h
  F:    Documentation/x86/intel_rdt*
  
  READ-COPY UPDATE (RCU)
@@@ -11457,17 -11280,6 +11457,17 @@@ L: linux-serial@vger.kernel.or
  S:    Odd Fixes
  F:    drivers/tty/serial/rp2.*
  
 +ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
 +M:    Marek Vasut <marek.vasut+renesas@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
 +S:    Supported
 +F:    drivers/mfd/bd9571mwv.c
 +F:    drivers/regulator/bd9571mwv-regulator.c
 +F:    drivers/gpio/gpio-bd9571mwv.c
 +F:    include/linux/mfd/bd9571mwv.h
 +F:    Documentation/devicetree/bindings/mfd/bd9571mwv.txt
 +
  ROSE NETWORK LAYER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-hams@vger.kernel.org
@@@ -11629,7 -11441,6 +11629,7 @@@ F:   drivers/s390/crypto
  
  S390 ZFCP DRIVER
  M:    Steffen Maier <maier@linux.vnet.ibm.com>
 +M:    Benjamin Block <bblock@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12678,12 -12489,6 +12678,12 @@@ M: Ion Badulescu <ionut@badula.org
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STEC S1220 SKD DRIVER
 +M:    Bart Van Assche <bart.vanassche@wdc.com>
 +L:    linux-block@vger.kernel.org
 +S:    Maintained
 +F:    drivers/block/skd*[ch]
 +
  STI CEC DRIVER
  M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
  S:    Maintained
@@@ -13187,11 -12992,6 +13187,11 @@@ M: Yehezkel Bernat <yehezkel.bernat@int
  S:    Maintained
  F:    drivers/thunderbolt/
  
 +THUNDERX GPIO DRIVER
 +M:    David Daney <david.daney@cavium.com>
 +S:    Maintained
 +F:    drivers/gpio/gpio-thunderx.c
 +
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -13716,7 -13516,8 +13716,7 @@@ F:   Documentation/scsi/ufs.tx
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 -M:    Manjunath M Bettegowda <manjumb@synopsys.com>
 -M:    Prabu Thangamuthu <prabut@synopsys.com>
 +M:    Joao Pinto <jpinto@synopsys.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
index dece47d76282acdfa78452cd4c0b366fedcfab92,a444b139bff5be1c0bf62d34ae2d3341acc73185..6a38c76030644362019375e3195333cd627ef396
  #include <linux/delay.h>
  #include <linux/i2c.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/input.h>
 -#include <linux/i2c/tps65010.h>
 +#include <linux/mfd/tps65010.h>
  #include <linux/smc91x.h>
  #include <linux/omapfb.h>
  #include <linux/platform_data/gpio-omap.h>
index 6d32beeb2d88572da97f353e67790a3106c843c3,a618a49a30b8a7a429e644f6be214f9928c1743d..302260583e8ea5d8b50ad9b0ae820679fa422b31
  #include <linux/workqueue.h>
  #include <linux/i2c.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/input.h>
  #include <linux/spi/spi.h>
 -#include <linux/i2c/tps65010.h>
 +#include <linux/mfd/tps65010.h>
  #include <linux/smc91x.h>
  #include <linux/omapfb.h>
  #include <linux/platform_data/gpio-omap.h>
index 64b1a0b7b803a19347d522e4ffbda3f970242ad7,a6657e7204307272d0e6d36e7e594fbcab5fd5fb..ed3b22ceef06c75cbca69a8f2e5cef72183a3a47
@@@ -24,7 -24,7 +24,7 @@@
  #include <linux/io.h>
  #include <linux/platform_device.h>
  
 -#include <linux/i2c/tps65010.h>
 +#include <linux/mfd/tps65010.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -36,7 -36,7 +36,7 @@@
  #include <linux/platform_data/i2c-s3c2410.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/partitions.h>
  
index 1913ce18fb1cc33d6e17ac338995dd4b0d11cd79,08abd180530ac08a5917c3632dbd3f91398c5e29..f25eca79f4e56d096ed749918752e8aca26ee68d
@@@ -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>
@@@ -247,7 -247,6 +247,7 @@@ struct atmel_hsmc_nand_controller 
                void __iomem *virt;
                dma_addr_t dma;
        } sram;
 +      const struct atmel_hsmc_reg_layout *hsmc_layout;
        struct regmap *io;
        struct atmel_nfc_op op;
        struct completion complete;
@@@ -1443,12 -1442,12 +1443,12 @@@ static int atmel_hsmc_nand_setup_data_i
                                        int csline,
                                        const struct nand_data_interface *conf)
  {
 -      struct atmel_nand_controller *nc;
 +      struct atmel_hsmc_nand_controller *nc;
        struct atmel_smc_cs_conf smcconf;
        struct atmel_nand_cs *cs;
        int ret;
  
 -      nc = to_nand_controller(nand->base.controller);
 +      nc = to_hsmc_nand_controller(nand->base.controller);
  
        ret = atmel_smc_nand_prepare_smcconf(nand, conf, &smcconf);
        if (ret)
        if (cs->rb.type == ATMEL_NAND_NATIVE_RB)
                cs->smcconf.timings |= ATMEL_HSMC_TIMINGS_RBNSEL(cs->rb.id);
  
 -      atmel_hsmc_cs_conf_apply(nc->smc, cs->id, &cs->smcconf);
 +      atmel_hsmc_cs_conf_apply(nc->base.smc, nc->hsmc_layout, cs->id,
 +                               &cs->smcconf);
  
        return 0;
  }
@@@ -2091,8 -2089,8 +2091,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,15 -2177,14 +2179,16 @@@ atmel_hsmc_nand_controller_init(struct 
                return -EINVAL;
        }
  
 +      nc->hsmc_layout = atmel_hsmc_get_reg_layout(np);
 +
        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 9fdb54a95976ccbf15ad25004f58b13db7bc483e,969ee1078adad4345441f13fa1056982bda3998f..8acfc1e099e11079cde2ed23d028bd6d5fb79bc6
   * .data section
   */
  #define DATA_DATA                                                     \
+       *(.xiptext)                                                     \
        *(DATA_MAIN)                                                    \
        *(.ref.data)                                                    \
        *(.data..shared_aligned) /* percpu related */                   \
                *(.entry.text)                                          \
                VMLINUX_SYMBOL(__entry_text_end) = .;
  
 -#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
  #define IRQENTRY_TEXT                                                 \
                ALIGN_FUNCTION();                                       \
                VMLINUX_SYMBOL(__irqentry_text_start) = .;              \
                *(.irqentry.text)                                       \
                VMLINUX_SYMBOL(__irqentry_text_end) = .;
 -#else
 -#define IRQENTRY_TEXT
 -#endif
  
 -#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
  #define SOFTIRQENTRY_TEXT                                             \
                ALIGN_FUNCTION();                                       \
                VMLINUX_SYMBOL(__softirqentry_text_start) = .;          \
                *(.softirqentry.text)                                   \
                VMLINUX_SYMBOL(__softirqentry_text_end) = .;
 -#else
 -#define SOFTIRQENTRY_TEXT
 -#endif
  
  /* Section used for early init (in .S files) */
  #define HEAD_TEXT  *(.head.text)
  #define BUG_TABLE
  #endif
  
 +#ifdef CONFIG_ORC_UNWINDER
 +#define ORC_UNWIND_TABLE                                              \
 +      . = ALIGN(4);                                                   \
 +      .orc_unwind_ip : AT(ADDR(.orc_unwind_ip) - LOAD_OFFSET) {       \
 +              VMLINUX_SYMBOL(__start_orc_unwind_ip) = .;              \
 +              KEEP(*(.orc_unwind_ip))                                 \
 +              VMLINUX_SYMBOL(__stop_orc_unwind_ip) = .;               \
 +      }                                                               \
 +      . = ALIGN(6);                                                   \
 +      .orc_unwind : AT(ADDR(.orc_unwind) - LOAD_OFFSET) {             \
 +              VMLINUX_SYMBOL(__start_orc_unwind) = .;                 \
 +              KEEP(*(.orc_unwind))                                    \
 +              VMLINUX_SYMBOL(__stop_orc_unwind) = .;                  \
 +      }                                                               \
 +      . = ALIGN(4);                                                   \
 +      .orc_lookup : AT(ADDR(.orc_lookup) - LOAD_OFFSET) {             \
 +              VMLINUX_SYMBOL(orc_lookup) = .;                         \
 +              . += (((SIZEOF(.text) + LOOKUP_BLOCK_SIZE - 1) /        \
 +                      LOOKUP_BLOCK_SIZE) + 1) * 4;                    \
 +              VMLINUX_SYMBOL(orc_lookup_end) = .;                     \
 +      }
 +#else
 +#define ORC_UNWIND_TABLE
 +#endif
 +
  #ifdef CONFIG_PM_TRACE
  #define TRACEDATA                                                     \
        . = ALIGN(4);                                                   \
                DATA_DATA                                               \
                CONSTRUCTORS                                            \
        }                                                               \
 -      BUG_TABLE
 +      BUG_TABLE                                                       \
  
  #define INIT_TEXT_SECTION(inittext_align)                             \
        . = ALIGN(inittext_align);                                      \
diff --combined include/linux/mfd/tmio.h
index b572955e6de6ab9d50cd8701a2a0a1a6eeac0c7a,357b6cfdf34a988938facebb64ce457cc7eef887..15646740e2a8ce38654a87371bf19522b340d974
   */
  #define TMIO_MMC_CLK_ACTUAL           BIT(10)
  
 +/* Some controllers have a CBSY bit */
 +#define TMIO_MMC_HAVE_CBSY            BIT(11)
 +
  int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);
  int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);
  void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);
@@@ -131,8 -128,6 +131,8 @@@ struct tmio_mmc_data 
        unsigned int                    cd_gpio;
        int                             alignment_shift;
        dma_addr_t                      dma_rx_offset;
 +      unsigned int                    max_blk_count;
 +      unsigned short                  max_segs;
        void (*set_pwr)(struct platform_device *host, int state);
        void (*set_clk_div)(struct platform_device *host, int state);
  };
@@@ -144,6 -139,7 +144,7 @@@ struct tmio_nand_data 
        struct nand_bbt_descr   *badblock_pattern;
        struct mtd_partition    *partition;
        unsigned int            num_partitions;
+       const char *const       *part_parsers;
  };
  
  #define FBIO_TMIO_ACC_WRITE   0x7C639300