From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Dec 2017 00:18:01 +0000 (-0800)
Subject: Merge tag 'for-linus-20171218' of git://git.infradead.org/linux-mtd
X-Git-Tag: v4.15~173
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ace52288edf0cb5e7a52b681f057f86224c49c27;p=mirror_ubuntu-bionic-kernel.git

Merge tag 'for-linus-20171218' of git://git.infradead.org/linux-mtd

Pull MTD fixes from Richard Weinberger:
 "This contains the following regression fixes:

   - fix bitflip handling in brcmnand and gpmi nand drivers

   - revert a bad device tree binding for spi-nor

   - fix a copy&paste error in gpio-nand driver

   - fix a too strict length check in mtd core"

* tag 'for-linus-20171218' of git://git.infradead.org/linux-mtd:
  mtd: Fix mtd_check_oob_ops()
  mtd: nand: gpio: Fix ALE gpio configuration
  mtd: nand: brcmnand: Zero bitflip is not an error
  mtd: nand: gpmi: Fix failure when a erased page has a bitflip at BBM
  Revert "dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list"
---

ace52288edf0cb5e7a52b681f057f86224c49c27