From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Nov 2018 20:18:00 +0000 (-0800)
Subject: Merge tag 'mtd/fixes-for-4.20-rc5' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.20-rc5~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=da59f180d529fc78591e71acf2c67114b8eff10d;p=nvme.git

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
---

da59f180d529fc78591e71acf2c67114b8eff10d