Revision fb1d8e0e2c50f374cfc244564decfc3f0a336cb4 authored by Linus Torvalds on 18 January 2017, 21:58:38 UTC, committed by Linus Torvalds on 18 January 2017, 21:58:38 UTC
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
