Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

Pull UBI/UBIFS updates from Richard Weinberger:

 - fscrypt framework usage updates

 - One huge fix for xattr unlink

 - Cleanup of fscrypt ifdefs

 - Fix for our new UBIFS auth feature

* tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubi: wl: Fix uninitialized variable
  ubifs: Drop unnecessary setting of zbr->znode
  ubifs: Remove ifdefs around CONFIG_UBIFS_ATIME_SUPPORT
  ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION
  ubifs: Limit number of xattrs per inode
  ubifs: orphan: Handle xattrs like files
  ubifs: journal: Handle xattrs like files
  ubifs: find.c: replace swap function with built-in one
  ubifs: Do not skip hash checking in data nodes
  ubifs: work around high stack usage with clang
  ubifs: remove unused function __ubifs_shash_final
  ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy()
  ubifs: remove unnecessary calls to set up directory key

diff --cc fs/ubifs/auth.c
index b758004085c4758c0127c1d51c7fc172db8c7ac1,3d049194afa44ddf7fa47c223156d00a0afa33b6..60f43b93d06e4b479fa2543f90619ffa841d0fe7
--- 1/fs/ubifs/auth.c
--- 2/fs/ubifs/auth.c
+++ b/fs/ubifs/auth.c
@@@ -85,12 -86,17 +84,16 @@@ int ubifs_prepare_auth_node(struct ubif
        if (!hash)
                return -ENOMEM;
  
-       hash_desc->tfm = c->hash_tfm;
-       ubifs_shash_copy_state(c, inhash, hash_desc);
+       {
+               SHASH_DESC_ON_STACK(hash_desc, c->hash_tfm);
  
-       err = crypto_shash_final(hash_desc, hash);
-       if (err)
-               goto out;
+               hash_desc->tfm = c->hash_tfm;
 -              hash_desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+               ubifs_shash_copy_state(c, inhash, hash_desc);
+ 
+               err = crypto_shash_final(hash_desc, hash);
+               if (err)
+                       goto out;
+       }
  
        err = ubifs_hash_calc_hmac(c, hash, auth->hmac);
        if (err)

diff --cc fs/ubifs/dir.c
Simple merge

diff --cc fs/ubifs/super.c
Simple merge

diff --cc include/linux/fscrypt.h
Simple merge