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=-3.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 3B506C43466 for ; Mon, 21 Sep 2020 02:36:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EEA64207BB for ; Mon, 21 Sep 2020 02:36:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Hx2FBdfH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726236AbgIUCgY (ORCPT ); Sun, 20 Sep 2020 22:36:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726011AbgIUCgY (ORCPT ); Sun, 20 Sep 2020 22:36:24 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2332EC061755; Sun, 20 Sep 2020 19:36:24 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4BvpTx02gyz9sR4; Mon, 21 Sep 2020 12:36:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1600655781; bh=S4MJY8JMup+AWKB8AHwtHY/lJhtUoFXs2nYPCSCNrTs=; h=Date:From:To:Cc:Subject:From; b=Hx2FBdfHPTBohZ3RsaLbD7YAPUJlmz8/HCYzwY1I13EtWbAoASblHqkOcXyY3mcdg mjR72KXTKX84KgpU8svW84DNwoYqd8MOlyvA0ZDN6Eu5b9zhCLUTp2C1AjEUNGuB98 2TapqWRTQlwUY0pLnkcoB6WiYWr2ggTtfB8Dv588PXM1RwjvTsY84nGx0S467XVlTL gyKvUCkseQ7E7t5MDDWuNbwHc2ic18jq91ClqluAloxnSMtJ7/VTzaSwk81KHaf1t8 GNQwOhEePvFWlPSsaJ4KHX6dFoEKe48BeJMnCQRyWLST6Ux0G3agh7MohlK0gxqK+K yB/Xcaf2ORjaw== Date: Mon, 21 Sep 2020 12:36:19 +1000 From: Stephen Rothwell To: Herbert Xu , Linux Crypto List Cc: Randy Dunlap , Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the crypto tree with Linus' tree Message-ID: <20200921123619.2986ea3b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/RgGlW3x5VGD1UCBI6V6vQFQ"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/RgGlW3x5VGD1UCBI6V6vQFQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the crypto tree got a conflict in: drivers/crypto/Kconfig between commit: bfe8fe939a04 ("crypto: sa2ul - add Kconfig selects to fix build error") from Linus' tree and commit: 61f033ba18c3 ("crypto: sa2ul - Select CRYPTO_AUTHENC") from the crypto 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/crypto/Kconfig index 52a9b7cf6576,c2950127def6..000000000000 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@@ -873,9 -873,7 +873,10 @@@ config CRYPTO_DEV_SA2U select CRYPTO_AES select CRYPTO_AES_ARM64 select CRYPTO_ALGAPI + select CRYPTO_AUTHENC + select CRYPTO_SHA1 + select CRYPTO_SHA256 + select CRYPTO_SHA512 select HW_RANDOM select SG_SPLIT help --Sig_/RgGlW3x5VGD1UCBI6V6vQFQ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9oEaMACgkQAVBC80lX 0Gxajgf+OvG+VcnVFycirKmyNkLZyzn70CjhdAXdDvONWm4IRS4vd2nz1PbjBrIS bbP7mFnvtkp/MEVuu0UGTsUHHdZMVVul0sJD1H3bKhI+8QO2oOdyjTJSW1tvzHrY ZvX79Kw45ODLurFX99xB/1rOs0nvAYJ7IXvbTFhEcwViAblczXM6qp3ileyB7gGf t2DJ4nidg9SOITBjW+BpvnbBwIIQ72i3ZaxJhhuqaWWM0mDZ60hoyqGern6oKu8v P8K8NGvpx4Rm+juhBr6BQUucRL12EwQTjRTag6jC1UQqzErG7z+x2ieNgEG2yMwS xu8wi2hbfR2XYBCuPP8Upt/XeAQiaA== =r6AE -----END PGP SIGNATURE----- --Sig_/RgGlW3x5VGD1UCBI6V6vQFQ--