Merge tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2016 19:54:41 +0000 (15:54 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2016 19:54:41 +0000 (15:54 -0400)
commit94ef71a99a60cb03eda550410bc0b4db77ea50cf
tree6249c18eb07484cf1adfd00955d4df212547e2da
parentfe2dd212828d5c8ebe2f650f5089c705afc78ce5
parent17ce1eb0b64eb27d4f9180daae7495fa022c7b0d
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()