• Linus Torvalds's avatar
    Merge tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd · 54245ed8
    Linus Torvalds authored
    Pull MTD updates from Brian Norris:
     "JFFS2:
       - fix a theoretical unbalanced locking issue; the lock handling was a
         bit unclean, but AFAICT, it didn't actually lead to real deadlocks
    
      NAND:
       - brcmnand driver: new driver supporting NAND controller found
         originally on Broadcom STB SoCs (BCM7xxx), but now also found on
         BCM63xxx, iProc (e.g., Cygnus, BCM5301x), BCM3xxx, and more
    
       - begin factoring out BBT code so it can be shared between
         traditional (parallel) NAND drivers and upcoming SPI NAND drivers
         (WIP)
    
       - add common DT-based init support, so nand_base can pick up some
         flash properties automatically, using established common NAND DT
         properties
    
       - mxc_nand: support 8-bit ECC
    
       - pxa3xx_nand:
         * fix build for ARM64
         * use a jiffies-based timeout
    
      SPI NOR:
       - add a few new IDs
    
       - clear out some unnecessary entries
    
       - make sure SECT_4K flags are correct for all (?) entries
    
      Core:
       - fix mtd->usecount race conditions (BUG_ON())
    
       - switch to modern PM ops
    
      Other:
       - CFI: save code space by de-inlining large functions
    
       - clean up some partition parser selection code across several
         drivers
    
       - various miscellaneous changes, mostly minor"
    
    * tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd: (57 commits)
      mtd: docg3: Fix kasprintf() usage
      mtd: docg3: Don't leak docg3->bbt in error path
      mtd: nandsim: Fix kasprintf() usage
      mtd: cs553x_nand: Fix kasprintf() usage
      mtd: r852: Fix device_create_file() usage
      mtd: brcmnand: drop unnecessary initialization
      mtd: propagate error codes from add_mtd_device()
      mtd: diskonchip: remove two-phase partitioning / registration
      mtd: dc21285: use raw spinlock functions for nw_gpio_lock
      mtd: chips: fixup dependencies, to prevent build error
      mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial
      mtd: cfi: deinline large functions
      mtd: lantiq-flash: use default partition parsers
      mtd: plat_nand: use default partition probe
      mtd: nand: correct indentation within conditional
      mtd: remove incorrect file name
      mtd: blktrans: use better error code for unimplemented ioctl()
      mtd: maps: Spelling s/reseved/reserved/
      mtd: blktrans: change blktrans_getgeo return value
      mtd: mxc_nand: generate nand_ecclayout for 8 bit ECC
      ...
    54245ed8
fs.c 19.9 KB