linux-next: manual merge of the ubifs tree with Linus' tree

linux-next: manual merge of the ubifs tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]

Hi all,

Today's linux-next merge of the ubifs tree got a conflict in:

  fs/ubifs/auth.c

between commit:

  877b5691f27a ("crypto: shash - remove shash_desc::flags")

from Linus' tree and commit:

  f4844b35d68a ("ubifs: work around high stack usage with clang")

from the ubifs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ubifs/auth.c
index b758004085c4,3d049194afa4..000000000000
--- a/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)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]