From patchwork Fri May 20 06:57:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 574632 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17855C433EF for ; Fri, 20 May 2022 06:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243176AbiETG5G (ORCPT ); Fri, 20 May 2022 02:57:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235886AbiETG5F (ORCPT ); Fri, 20 May 2022 02:57:05 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45C5566AEA; Thu, 19 May 2022 23:57:04 -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 4L4Hb23dQhz4xD9; Fri, 20 May 2022 16:57:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653029822; bh=3qcC0zxa4JNcBZM2KoM0PUrp8oT7ymNUmD1Kh8x2BLE=; h=Date:From:To:Cc:Subject:From; b=mF5G2mI9LN/6goV1xEUdlwdttZuZYp7qiCAR5xLBbEVqryX0rm3YGAmOk33Pt1E8M VANVjdea+1WsIU6hDoc1Xsj/0eoYM2/e78Zh3YLLungYPf9PXy36XaSHKQKLn/t5f3 8sb7xnaSkTXhVpv+oEQmIq+RtM5aMWivrQE/ttYxv2IaGhBit4cQizElTpkwEtZDz4 jmRtDcw5Oe8o0xulE4UB5VOxacJOGj9NKoij8bjqmuTJCsHfyy2VBJ15GJB0Bg8Zwz zHXzi9ac8mcYl+vB2jffIH/c0WQHm10OLmFCwrSpgv7d+jddQ98Uz8RhCj/zUA+cUk n6D78eZmZAcBQ== Date: Fri, 20 May 2022 16:57:01 +1000 From: Stephen Rothwell To: Jarkko Sakkinen , Herbert Xu Cc: Linux Crypto List , Ahmad Fatoum , Linux Kernel Mailing List , Linux Next Mailing List , Meenakshi Aggarwal , Steffen Trumtrar Subject: linux-next: manual merge of the tpmdd tree with the crypto tree Message-ID: <20220520165701.14224ddb@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Hi all, Today's linux-next merge of the tpmdd tree got a conflict in: drivers/crypto/caam/Kconfig between commit: 0aa6ac7795ca ("crypto: caam/rng - Add support for PRNG") from the crypto tree and commit: 5e785783ddb0 ("crypto: caam - add in-kernel interface for blob generator") from the tpmdd 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/caam/Kconfig index 0aa52b612a01,ea9f8b1ae981..000000000000 --- a/drivers/crypto/caam/Kconfig