Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd

Pull MTD updates from Brian Norris:
 "NAND:

   - Add new Hisilicon NAND driver for Hip04
   - Add default reboot handler, to ensure all outstanding erase
     transactions complete in time
   - jz4740: convert to use GPIO descriptor API
   - Atmel: add support for sama5d4
   - Change default bitflip threshold to 75% of correction strength
   - Miscellaneous cleanups and bugfixes

  SPI NOR:

   - Freescale QuadSPI:
   - Fix a few probe() and remove() issues
   - Add a MAINTAINERS entry for this driver
   - Tweak transfer size to increase read performance
   - Add suspend/resume support
   - Add Micron quad I/O support
   - ST FSM SPI: miscellaneous fixes

  JFFS2:

   - gracefully handle corrupted 'offset' field found on flash

  Other:

   - bcm47xxpart: add tweaks for a few new devices
   - mtdconcat: set return lengths properly for mtd_write_oob()
   - map_ram: enable use with mtdoops
   - maps: support fallback to ROM/UBI for write-protected NOR flash"

* tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd: (46 commits)
  mtd: hisilicon: && vs & typo
  jffs2: fix handling of corrupted summary length
  mtd: hisilicon: add device tree binding documentation
  mtd: hisilicon: add a new NAND controller driver for hisilicon hip04 Soc
  mtd: avoid registering reboot notifier twice
  mtd: concat: set the return lengths properly
  mtd: kconfig: replace PPC_OF with PPC
  mtd: denali: remove unnecessary stubs
  mtd: nand: remove redundant local variable
  MAINTAINERS: add maintainer entry for FREESCALE QUAD SPI driver
  mtd: fsl-quadspi: improve read performance by increase AHB transfer size
  mtd: fsl-quadspi: Remove unnecessary 'map_failed' label
  mtd: fsl-quadspi: Remove unneeded success/error messages
  mtd: fsl-quadspi: Fix the error paths
  mtd: nand: omap: drop condition with no effect
  mtd: nand: jz4740: Convert to GPIO descriptor API
  mtd: nand: Request strength instead of bytes for soft BCH
  mtd: nand: default bitflip-reporting threshold to 75% of correction strength
  mtd: atmel_nand: introduce a new compatible string for sama5d4 chip
  mtd: atmel_nand: return max bitflips in all sectors in pmecc_correction()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mtd/mtdconcat.c
Simple merge

diff --cc drivers/mtd/mtdcore.c
index 0ec4d6e,52eea93..11883bd
--- 1/drivers/mtd/mtdcore.c
--- 2/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -339,23 -366,17 +340,34 @@@ static struct device_type mtd_devtype 
        .release        = mtd_release,
  };
  
 +#ifndef CONFIG_MMU
 +unsigned mtd_mmap_capabilities(struct mtd_info *mtd)
 +{
 +      switch (mtd->type) {
 +      case MTD_RAM:
 +              return NOMMU_MAP_COPY | NOMMU_MAP_DIRECT | NOMMU_MAP_EXEC |
 +                      NOMMU_MAP_READ | NOMMU_MAP_WRITE;
 +      case MTD_ROM:
 +              return NOMMU_MAP_COPY | NOMMU_MAP_DIRECT | NOMMU_MAP_EXEC |
 +                      NOMMU_MAP_READ;
 +      default:
 +              return NOMMU_MAP_COPY;
 +      }
 +}
 +EXPORT_SYMBOL_GPL(mtd_mmap_capabilities);
 +#endif
 +
+ static int mtd_reboot_notifier(struct notifier_block *n, unsigned long state,
+                              void *cmd)
+ {
+       struct mtd_info *mtd;
+ 
+       mtd = container_of(n, struct mtd_info, reboot_notifier);
+       mtd->_reboot(mtd);
+ 
+       return NOTIFY_DONE;
+ }
+ 
  /**
   *    add_mtd_device - register an MTD device
   *    @mtd: pointer to new MTD device info structure

diff --cc include/linux/mtd/mtd.h
Simple merge