From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Aug 2016 19:54:41 +0000 (-0400)
Subject: Merge tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.8-rc4~20
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=94ef71a99a60cb03eda550410bc0b4db77ea50cf

Merge tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs

Pull UBIFS fixes from Richard Weinberger:
 "This pull requests contains fixes for two issues in UBI and UBIFS:

   - wrong UBIFS assertion.
   - a UBIFS xattr regression"

* tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs:
  ubifs: Fix xattr generic handler usage
  ubifs: Fix assertion in layout_in_gaps()
---

94ef71a99a60cb03eda550410bc0b4db77ea50cf