From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 May 2018 16:58:29 +0000 (-0700)
Subject: Merge tag 'mtd/fixes-for-4.17-rc6' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.19~1028
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=163ced613c37a504f8ed94676fd21c85183d8e8c;p=platform%2Fkernel%2Flinux-rpi3.git

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

Pull mtd fixes from Boris Brezillon:
 "NAND fixes:
   - Fix read path of the Marvell NAND driver
   - Make sure we don't pass a u64 to ndelay()

  CFI fix:
   - Fix the map_word_andequal() implementation"

* tag 'mtd/fixes-for-4.17-rc6' of git://git.infradead.org/linux-mtd:
  mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit
  mtd: rawnand: marvell: Fix read logic for layouts with ->nchunks > 2
  mtd: Fix comparison in map_word_andequal()
---

163ced613c37a504f8ed94676fd21c85183d8e8c