From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Nov 2018 16:35:30 +0000 (-0800)
Subject: Merge tag 'mtd/fixes-for-4.20-rc4' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.20-rc4~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ef4d6f2c0c659922856bb48cbb7a83ac97941e01;p=linux-block.git

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

Pull mtd fixes from Boris Brezillon:
 "SPI NOR fixes:

   - Various fixes related to the SFDP parsing code merged in 4.20

   - Fix for a page fault in the cadence-qspi

  NAND fixes:

   - Fix a macro name conflict between the QCOM NAND controller driver
     and the RISC-V asm headers

   - Fix of-node handling in the atmel driver"

* tag 'mtd/fixes-for-4.20-rc4' of git://git.infradead.org/linux-mtd:
  mtd: spi-nor: fix selection of uniform erase type in flexible conf
  mtd: spi-nor: Fix Cadence QSPI page fault kernel panic
  mtd: rawnand: qcom: Namespace prefix some commands
  mtd: rawnand: atmel: fix OF child-node lookup
  mtd: spi_nor: pass DMA-able buffer to spi_nor_read_raw()
  mtd: spi-nor: don't overwrite errno in spi_nor_get_map_in_use()
  mtd: spi-nor: fix iteration over smpt array
  mtd: spi-nor: don't drop sfdp data if optional parsers fail
---

ef4d6f2c0c659922856bb48cbb7a83ac97941e01