From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Jun 2015 21:11:34 +0000 (-0700)
Subject: Merge tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.2-rc1~117
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cc8a0a943948d1b1bc803b37486831af7b04dd38;p=linux.git

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

Pull UBI/UBIFS updates from Richard Weinberger:
 "Minor fixes for UBI and UBIFS"

* tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifs:
  UBI: Remove unnecessary `\'
  UBI: Use static class and attribute groups
  UBI: add a helper function for updatting on-flash layout volumes
  UBI: Fastmap: Do not add vol if it already exists
  UBI: Init vol->reserved_pebs by assignment
  UBI: Fastmap: Rename variables to make them meaningful
  UBI: Fastmap: Remove unnecessary `\'
  UBI: Fastmap: Use max() to get the larger value
  ubifs: fix to check error code of register_shrinker
  UBI: block: Dynamically allocate minor numbers
---

cc8a0a943948d1b1bc803b37486831af7b04dd38