From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Dec 2014 17:57:22 +0000 (-0800)
Subject: Merge tag 'upstream-3.19-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.14-rc1~6324
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccb5a4910d0ca7b1742b9217db2e1b95817e25ac;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull UBI/UBIFS updates from Artem Bityutskiy:
 "This includes the following UBI/UBIFS changes:
   - UBI debug messages now include the UBI device number.  This change
     is responsible for the big diffstat since it touched every
     debugging print statement.
   - An Xattr bug-fix which fixes SELinux support
   - Several error path fixes in UBI/UBIFS"

* tag 'upstream-3.19-rc1' of git://git.infradead.org/linux-ubifs:
  UBI: Fix invalid vfree()
  UBI: Fix double free after do_sync_erase()
  UBIFS: fix a couple bugs in UBIFS xattr length calculation
  UBI: vtbl: Use ubi_eba_atomic_leb_change()
  UBI: Extend UBI layer debug/messaging capabilities
  UBIFS: fix budget leak in error path
---

ccb5a4910d0ca7b1742b9217db2e1b95817e25ac