From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F9FDCA90AF for ; Tue, 12 May 2020 16:22:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D999206B8 for ; Tue, 12 May 2020 16:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589300530; bh=auWCmjjq3v0fWHq4aHnc4pBsHWKq4S/upZDC+grvgio=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=s2I4k8SR+vMdatO+UEOvxKD7++g5TFDRWqj+PT+tRl/Pt9p5JBGNrSkT5kMRYhNM2 8YWPTgsQKB48a0LI1ZW5/XD0UfTDaLEu/T55BMEyLf/Bsv0yPOUiwiCFovQeSEdrLK CKTUp5lA7y9k6BDR9UJCCM6lUUsuKz/BK1cnALHw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726031AbgELQWJ (ORCPT ); Tue, 12 May 2020 12:22:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:55470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725950AbgELQWJ (ORCPT ); Tue, 12 May 2020 12:22:09 -0400 Received: from localhost (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 66C9E206B7; Tue, 12 May 2020 16:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589300529; bh=auWCmjjq3v0fWHq4aHnc4pBsHWKq4S/upZDC+grvgio=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=R8+yeHyBqPrFn/brY4mLXlGh1Ues0feVlECxgDmBIupsxQYCN/uEzyG9huMyWmAnv kBntTGIHC+lSsumb/pWrZudHTyjdUbwbx00WiOZbR5FCrAC/s+Jb+9o1rx/A9MZF+V ON1ESwWgxDiBZJ+tiIQae9pCwK4nGt/Hz6A2JoBg= Date: Tue, 12 May 2020 17:22:05 +0100 From: Mark Brown To: Stephen Rothwell Cc: Liam Girdwood , Herbert Xu , Linux Crypto List , Linux Next Mailing List , Linux Kernel Mailing List , Eric Biggers , Arnd Bergmann Subject: Re: linux-next: manual merge of the sound-asoc tree with the crypto tree Message-ID: <20200512162205.GI5110@sirena.org.uk> References: <20200512144949.4f933eca@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="X+nYw8KZ/oNxZ8JS" Content-Disposition: inline In-Reply-To: <20200512144949.4f933eca@canb.auug.org.au> X-Cookie: The only perfect science is hind-sight. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org --X+nYw8KZ/oNxZ8JS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 12, 2020 at 02:49:49PM +1000, Stephen Rothwell wrote: > Hi all, >=20 > Today's linux-next merge of the sound-asoc tree got a conflict in: >=20 > sound/soc/codecs/cros_ec_codec.c >=20 > between commit: >=20 > 85fc78b80f15 ("ASoC: cros_ec_codec: use crypto_shash_tfm_digest()") >=20 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? --X+nYw8KZ/oNxZ8JS Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl66zSwACgkQJNaLcl1U h9BIJwf/d+OLV0SpxeplooUGiuxQ8kkocjrS4gtv/7z7NlC0QeQzM6ZVMFNqzH1J zpYTRpqNlwcE7FhRvVmstx9LJSk70PA1lokGLSfEj2bncItEFe0DEVOuxXChQCNe XwSpNSWBRtYojsQkrwvdScpkq2PPFTKv2tnGePHCGki9bfGPAUJPReuYAeLXdJ00 QK/MwLFqJFIvWN1DpU5tt81ZcKu/aOZ6sVTs7geeplcGb/eBRx2FzP3Zsumsf7dx 5ww7Hx4a1MAjShkMbaKkXE/IWd1f6hDXQB/hmC4k5DaAc2z2pPWRT92JbxOFzbX+ ORws7FBcKLJgVVTbIFW4zok6Arl7+Q== =unIm -----END PGP SIGNATURE----- --X+nYw8KZ/oNxZ8JS--