From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Feb 2018 18:06:13 +0000 (-0800)
Subject: Merge tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4b6415f9f9ca6bc8e449a73d8be1055aed63fd3a;p=linux.git

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

Pull mtd fixes from Boris Brezillon:

 - add missing dependency to NAND_MARVELL Kconfig entry

 - use the appropriate OOB layout in the VF610 driver

* tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd:
  mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA
  mtd: nand: vf610: set correct ooblayout
---

4b6415f9f9ca6bc8e449a73d8be1055aed63fd3a