From: Mark Brown <broonie@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Linux Crypto List <linux-crypto@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Eric Biggers <ebiggers@google.com>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the crypto tree
Date: Tue, 12 May 2020 17:22:05 +0100 [thread overview]
Message-ID: <20200512162205.GI5110@sirena.org.uk> (raw)
In-Reply-To: <20200512144949.4f933eca@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1036 bytes --]
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 the first I've heard of that patch :(
> from the crypto tree and commit:
> a1304cba816e ("ASoC: cros_ec_codec: allocate shash_desc dynamically")
> from the sound-asoc tree.
> I fixed it up (I just used the former) 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.
That doesn't seem ideal - Eric, Herbert can we get a branch with the
crypto patches in them to pull into the ASoC tree or something?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-05-12 16:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 4:49 linux-next: manual merge of the sound-asoc tree with the crypto tree Stephen Rothwell
2020-05-12 16:22 ` Mark Brown [this message]
2020-05-12 16:36 ` Eric Biggers
2020-05-12 17:08 ` Mark Brown
2020-05-12 20:08 ` Eric Biggers
2020-05-12 20:31 ` Arnd Bergmann
2020-05-14 13:21 ` Ard Biesheuvel
2020-05-13 2:52 ` Herbert Xu
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=20200512162205.GI5110@sirena.org.uk \
--to=broonie@kernel.org \
--cc=arnd@arndb.de \
--cc=ebiggers@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=lgirdwood@gmail.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).