From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Artem Bityutskiy <dedekind1@gmail•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Eric Biggers <ebiggers@google•com>,
Herbert Xu <herbert@gondor•apana.org.au>,
Arnd Bergmann <arnd@arndb•de>,
Richard Weinberger <richard@nod•at>
Subject: linux-next: manual merge of the ubifs tree with Linus' tree
Date: Wed, 8 May 2019 10:05:25 +1000 [thread overview]
Message-ID: <20190508100525.7c24c8be@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2019-05-08 0:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190508100525.7c24c8be@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=dedekind1@gmail$(echo .)com \
--cc=ebiggers@google$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=richard@nod$(echo .)at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox