From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Dec 2015 03:55:16 +0000 (-0800)
Subject: Merge tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v5.15~14521
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bef22eed98b53cfb3962884f14068251a5dd3f0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs

Pull UBI bug fixes from Richard Weinberger:
 "This contains four bug fixes for UBI"

* tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs:
  mtd: ubi: don't leak e if schedule_erase() fails
  mtd: ubi: fixup error correction in do_sync_erase()
  UBI: fix use of "VID" vs. "EC" in header self-check
  UBI: fix return error code
---

3bef22eed98b53cfb3962884f14068251a5dd3f0