From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Dec 2012 17:15:51 +0000 (-0800)
Subject: Merge tag 'upstream-3.7-rc9' of git://git.infradead.org/linux-ubi
X-Git-Tag: MMI-PSA29.97-13-9~15471
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70dcc535bdf30ffaef58b867fbde45c0287f34c6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'upstream-3.7-rc9' of git://git.infradead.org/linux-ubi

Pull UBI changes from Artem Bityutskiy:
 "Fixes for 2 brown-paperbag bugs introduced this merge window by the
  fastmap code:

   1.  The UBI background thread got stuck when a bit-flip happened
       because free LEBs was not removed from the "free" tree when we
       started using it.
   2.  I/O debugging checks did not work because we called a sleeping
       function in atomic context."

* tag 'upstream-3.7-rc9' of git://git.infradead.org/linux-ubi:
  UBI: dont call ubi_self_check_all_ff() in __wl_get_peb()
  UBI: remove PEB from free tree in get_peb_for_wl()
---

70dcc535bdf30ffaef58b867fbde45c0287f34c6