From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Nov 2018 12:04:29 +0000 (-0500)
Subject: Merge tag 'mtd/fixes-for-4.20-rc2' of git://git.infradead.org/linux-mtd
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d50ffc585dbec04fb1d219d5e8523fe6055e706f;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'mtd/fixes-for-4.20-rc2' of git://git.infradead.org/linux-mtd

Pull MTD fixes from Boris Brezillon:
 "MTD changes:
   - Kill a VLA in sa1100

  SPI NOR changes:
   - Make sure ->addr_width is restored when SFDP parsing fails
   - Propate errors happening in cqspi_direct_read_execute()

  NAND changes:
   - Fix kernel-doc mismatch
   - Fix nanddev_neraseblocks() to return the correct value
   - Avoid selection of BCH_CONST_PARAMS when some users require dynamic
     BCH settings"

* tag 'mtd/fixes-for-4.20-rc2' of git://git.infradead.org/linux-mtd:
  mtd: nand: Fix nanddev_pos_next_page() kernel-doc header
  mtd: sa1100: avoid VLA in sa1100_setup_mtd
  mtd: spi-nor: Reset nor->addr_width when SFDP parsing failed
  mtd: spi-nor: cadence-quadspi: Return error code in cqspi_direct_read_execute()
  mtd: nand: Fix nanddev_neraseblocks()
  mtd: nand: drop kernel-doc notation for a deleted function parameter
  mtd: docg3: don't set conflicting BCH_CONST_PARAMS option
---

d50ffc585dbec04fb1d219d5e8523fe6055e706f