commit fb1d8e0e2c50f374cfc244564decfc3f0a336cb4
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jan 18 13:58:38 2017 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jan 18 13:58:38 2017 -0800
tree 8903198620726b46268e802b640e854fe78ab357
parent fa19a769f82fb9a5ca000b83cacd13fcaeda51ac
parent 1cb51a15b576ee325d527726afff40947218fd5e

Merge tag 'upstream-4.10-rc5' of git://git.infradead.org/linux-ubifs

Pull UBIFS fixes from Richard Weinberger:
 "This contains fixes for UBIFS:

   - a long standing issue in UBIFS journal replay code

   - fallout from the merge window"

* tag 'upstream-4.10-rc5' of git://git.infradead.org/linux-ubifs:
  ubifs: Fix journal replay wrt. xattr nodes
  ubifs: remove redundant checks for encryption key
  ubifs: allow encryption ioctls in compat mode
  ubifs: add CONFIG_BLOCK dependency for encryption
  ubifs: fix unencrypted journal write
  ubifs: ensure zero err is returned on successful return