From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 May 2018 16:46:14 +0000 (-0700)
Subject: Merge tag 'mtd/fixes-for-4.17-rc5' of git://git.infradead.org/linux-mtd
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e03dc5d3d427ed0114258ba00b16277e705e2c0d;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'mtd/fixes-for-4.17-rc5' of git://git.infradead.org/linux-mtd

Pull mtd fixes from Boris Brezillon:

 - make nand_soft_waitrdy() wait tWB before polling the status REG

 - fix BCH write in the the Marvell NAND controller driver

 - fix wrong picosec to msec conversion in the Marvell NAND controller
   driver

 - fix DMA handling in the TI OneNAND controllre driver

* tag 'mtd/fixes-for-4.17-rc5' of git://git.infradead.org/linux-mtd:
  mtd: rawnand: Make sure we wait tWB before polling the STATUS reg
  mtd: rawnand: marvell: fix command xtype in BCH write hook
  mtd: rawnand: marvell: pass ms delay to wait_op
  mtd: onenand: omap2: Disable DMA for HIGHMEM buffers
---

e03dc5d3d427ed0114258ba00b16277e705e2c0d