projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe2dd21 17ce1eb)
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)
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()


Trivial merge
John Crispins staging tree