From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Jan 2014 04:04:09 +0000 (-0800)
Subject: Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: firefly_0821_release~176^2~4506
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2;p=firefly-linux-kernel-4.4.55.git

Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs

Pull ubifs updates from Artem Bityutskiy:

 - Improve the NOR erasure quirk - now it tries to do as little writes
   as possible, because the eraseblock may be in an "unstable" state and
   write operation sometimes causes NOR chip lock-ups.

 - Both UBI and UBIFS changes are now maintainer in one single tree,
   because the amount of changes dropped significantly.

* tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs:
  UBI: avoid program operation on NOR flash after erasure interrupted
  MAINTAINERS: keep UBI and UBIFS stuff in the same tree
  UBI: fix error return code
---

060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2