From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Jan 2016 02:20:20 +0000 (-0800)
Subject: Merge tag 'upstream-4.5-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.14-rc1~4049
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull UBI/UBIFS updates from Richard Weinberger:
 "This contains three changes - two cleanups and one UBI wear leveling
  improvement by Sebastian Siewior"

* tag 'upstream-4.5-rc1' of git://git.infradead.org/linux-ubifs:
  ubifs: Use XATTR_*_PREFIX_LEN
  UBIFS: add a comment in key.h for unused parameter
  mtd: ubi: wl: avoid erasing a PEB which is empty
---

60b7eca1dc2ec066916b3b7ac6ad89bea13cb9af