commit 163ced613c37a504f8ed94676fd21c85183d8e8c
author Linus Torvalds <torvalds@linux-foundation.org> Fri May 18 09:58:29 2018 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri May 18 09:58:29 2018 -0700
tree 85320d1392100d7d644d1b7d872446746c87884f
parent d90eb183e3d1ee82563a5f46db7ddfd73dbfbff9
parent 9f825e74d761c13b0cfaa5f65344d64ff970e252

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