From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Jul 2014 16:23:34 +0000 (-1000)
Subject: Merge tag 'upstream-3.16-rc6' of git://git.infradead.org/linux-ubifs
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=033ead8230c2cf9cdc2d6e1148bfdf5674012a9c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'upstream-3.16-rc6' of git://git.infradead.org/linux-ubifs

Pull UBI fixes from Artem Bityutskiy:
 "Two UBI fastmap-related fixes for v3.16:

   - fix UBI fastmap support which we broke in 3.16-rc1 by reversing the
     volumes RB-tree sorting criteria.
   - make sure that we scrub all PEBs where we see bit-flips - we were
     missing some of them when the fastmap feature was enabled"

* tag 'upstream-3.16-rc6' of git://git.infradead.org/linux-ubifs:
  UBI: fastmap: do not miss bit-flips
  UBI: fix the volumes tree sorting criteria
---

033ead8230c2cf9cdc2d6e1148bfdf5674012a9c