projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1286ed 40b4128)
Merge tag 'mtd/fixes-for-4.20-rc5' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Nov 2018 20:18:00 +0000 (12:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Nov 2018 20:18:00 +0000 (12:18 -0800)
commitda59f180d529fc78591e71acf2c67114b8eff10d
tree48297b34d4c5f82f5676ecda395cb38402980002tree | snapshot
parentb1286ed7158e9b62787508066283ab0b8850b518commit | diff
parent40b412897ccb4b98b2cfb2a0aaabed58dd9e2086commit | diff
Merge tag 'mtd/fixes-for-4.20-rc5' of git://git.infradead.org/linux-mtd

Pull mtd fixes from Boris Brezillon:
 "NAND fix:
   - Fix BBT cache allocation done in nanddev_bbt_init()

  SPI NOR fixes:
   - Fix the erase type selection logic"

* tag 'mtd/fixes-for-4.20-rc5' of git://git.infradead.org/linux-mtd:
  mtd: nand: Fix memory allocation in nanddev_bbt_init()
  mtd: spi-nor: fix erase_type array to indicate current map conf
John Crispins staging tree