From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jan 2017 21:58:38 +0000 (-0800)
Subject: Merge tag 'upstream-4.10-rc5' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.14-rc1~1677
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb1d8e0e2c50f374cfc244564decfc3f0a336cb4;p=platform%2Fkernel%2Flinux-rpi3.git

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
---

fb1d8e0e2c50f374cfc244564decfc3f0a336cb4