Re: linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-14 Thread Ard Biesheuvel
On Tue, 12 May 2020 at 22:31, Arnd Bergmann wrote: > > On Tue, May 12, 2020 at 10:08 PM Eric Biggers wrote: > > On Tue, May 12, 2020 at 06:08:01PM +0100, Mark Brown wrote: > > > > For later: if SHASH_DESC_ON_STACK is causing problems, we really ought to > > find a > > better solution, since lots

Re: linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-12 Thread Herbert Xu
On Tue, May 12, 2020 at 01:08:05PM -0700, Eric Biggers wrote: > > If you're concerned about total stack usage, then my recommendation is that > Herbert drops my patch "ASoC: cros_ec_codec: use crypto_shash_tfm_digest()" > from cryptodev, and you keep the patch > "ASoC: cros_ec_codec: allocate shash

Re: linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-12 Thread Arnd Bergmann
On Tue, May 12, 2020 at 10:08 PM Eric Biggers wrote: > On Tue, May 12, 2020 at 06:08:01PM +0100, Mark Brown wrote: > > For later: if SHASH_DESC_ON_STACK is causing problems, we really ought to > find a > better solution, since lots of users are using this macro. A version of > crypto_shash_tfm_d

Re: linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-12 Thread Eric Biggers
On Tue, May 12, 2020 at 06:08:01PM +0100, Mark Brown wrote: > On Tue, May 12, 2020 at 09:36:32AM -0700, Eric Biggers wrote: > > On Tue, May 12, 2020 at 05:22:05PM +0100, Mark Brown wrote: > > > > > from the crypto tree and commit: > > > > > a1304cba816e ("ASoC: cros_ec_codec: allocate shash_des

Re: linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-12 Thread Mark Brown
On Tue, May 12, 2020 at 09:36:32AM -0700, Eric Biggers wrote: > On Tue, May 12, 2020 at 05:22:05PM +0100, Mark Brown wrote: > > > from the crypto tree and commit: > > > a1304cba816e ("ASoC: cros_ec_codec: allocate shash_desc dynamically") > > > from the sound-asoc tree. > I Cc'ed it to the pe

Re: linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-12 Thread Eric Biggers
On Tue, May 12, 2020 at 05:22:05PM +0100, Mark Brown wrote: > On Tue, May 12, 2020 at 02:49:49PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the sound-asoc tree got a conflict in: > > > > sound/soc/codecs/cros_ec_codec.c > > > > between commit: > > > > 85f

Re: linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-12 Thread Mark Brown
On Tue, May 12, 2020 at 02:49:49PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the sound-asoc tree got a conflict in: > > sound/soc/codecs/cros_ec_codec.c > > between commit: > > 85fc78b80f15 ("ASoC: cros_ec_codec: use crypto_shash_tfm_digest()") > Oh, this is

linux-next: manual merge of the sound-asoc tree with the crypto tree

2020-05-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the sound-asoc tree got a conflict in: sound/soc/codecs/cros_ec_codec.c between commit: 85fc78b80f15 ("ASoC: cros_ec_codec: use crypto_shash_tfm_digest()") from the crypto tree and commit: a1304cba816e ("ASoC: cros_ec_codec: allocate shash_desc dynami