]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee78ad7 f23def8)
Merge tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Feb 2018 18:06:13 +0000 (10:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Feb 2018 18:06:13 +0000 (10:06 -0800)
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


Trivial merge
Ubuntu combined Linux kernel mirror