From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Feb 2014 21:16:05 +0000 (-0800)
Subject: Merge tag 'for-linus-20140225' of git://git.infradead.org/linux-mtd
X-Git-Tag: v5.15~18363
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4cc60cbdc4fd1d1050824937079bed2a4108864;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull MTD fixes from Brian Norris:
 "Two main MTD fixes:

  1. Read retry counting was off by one, so if we had a true ECC error
     (i.e., no retry voltage threshold would give a clean read), we
     would end up returning -EINVAL on the Nth mode instead of -EBADMSG
     after then (N-1)th mode

  2. The OMAP NAND driver had some of its ECC layouts wrong when
     introduced in 3.13, causing incompatibilities between the
     bootloader on-flash layout and the layout expected in Linux.  The
     expected layouts are now documented in the commit messages, and we
     plan to add this under Documentation/mtd/nand/ eventually"

* tag 'for-linus-20140225' of git://git.infradead.org/linux-mtd:
  mtd: nand: omap: fix ecclayout->oobfree->length
  mtd: nand: omap: fix ecclayout->oobfree->offset
  mtd: nand: omap: fix ecclayout to be in sync with u-boot NAND driver
  mtd: nand: fix off-by-one read retry mode counting
---

e4cc60cbdc4fd1d1050824937079bed2a4108864