From patchwork Mon Sep 21 02:36:19 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 11788239
X-Patchwork-Delegate: herbert@gondor.apana.org.au
Return-Path: <SRS0=YoIG=C6=vger.kernel.org=linux-crypto-owner@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
 [172.30.200.123])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 50DCD139F
	for <patchwork-linux-crypto@patchwork.kernel.org>;
 Mon, 21 Sep 2020 02:36:29 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 755CA207D3
	for <patchwork-linux-crypto@patchwork.kernel.org>;
 Mon, 21 Sep 2020 02:36:28 +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 S1726186AbgIUCgY (ORCPT
        <rfc822;patchwork-linux-crypto@patchwork.kernel.org>);
        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
        <rfc822;linux-crypto@vger.kernel.org>);
        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 <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
        Linux Crypto List <linux-crypto@vger.kernel.org>
Cc: Randy Dunlap <rdunlap@infradead.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the crypto tree with Linus' tree
Message-ID: <20200921123619.2986ea3b@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

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.

diff --cc drivers/crypto/Kconfig
index 52a9b7cf6576,c2950127def6..000000000000
--- a/drivers/crypto/Kconfig