From patchwork Mon Dec 14 23:46:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 343612 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham 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 DE34FC4361B for ; Mon, 14 Dec 2020 23:47:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F02C206EC for ; Mon, 14 Dec 2020 23:47:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbgLNXrK (ORCPT ); Mon, 14 Dec 2020 18:47:10 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:45813 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727300AbgLNXrJ (ORCPT ); Mon, 14 Dec 2020 18:47:09 -0500 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 4Cvyhf0k3xz9sRK; Tue, 15 Dec 2020 10:46:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607989587; bh=+zLolRCIT4qpIfZSJNjSg4Xw4U1OY+fGl+wCDLOzkjg=; h=Date:From:To:Cc:Subject:From; b=cnKfDbOMM3mjDgexqgrr1T84BKlaYj6kaGYaJkGTotX1LnyZyGvv3/2as5aZ7/qNC Iv9IL7pJtNm28c/DXH8TfeWvVxmASFpJITza20lNZu8U32BxtBD1GsPF9NI01xDpAe y3vMuHAff5Zyn3ArYWSybNgkWQmCcazV7KHvHDfTH9VOpRxJd5r/brUoNGtDlPw5L8 MIZ4RV/N0Y3mq78q2VjnwEWK/rfV7iXxnNkHSEp1Odphs5cvn364b13NtJyE1hCfRK K6uj2aCFB/5bNbZwVCDydR05sUvwJfw+PQ/G4Y1sW0bjHA3xcMaJysoNJxqnccLeUI FR+PVB0YOR01g== Date: Tue, 15 Dec 2020 10:46:24 +1100 From: Stephen Rothwell To: Jeff Layton , Ilya Dryomov , Herbert Xu , Linux Crypto List Cc: Eric Biggers , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the ceph tree Message-ID: <20201215104624.603c75da@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Hi all, After merging the ceph tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/ceph/messenger_v2.c:13:10: fatal error: crypto/sha.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~ Caused by commit cd1a677cad99 ("libceph, ceph: implement msgr2.1 protocol (crc and secure modes)") interacting with commit a24d22b225ce ("crypto: sha - split sha.h into sha1.h and sha2.h") from the crypto tree (and now in Linus' tree). I have applied the following merge fix patch: From: Stephen Rothwell Date: Tue, 15 Dec 2020 10:40:58 +1100 Subject: [PATCH] fixup for "crypto: sha - split sha.h into sha1.h and sha2.h" conflicting with "libceph, ceph: implement msgr2.1 protocol (crc and secure modes)" Signed-off-by: Stephen Rothwell --- net/ceph/messenger_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c index 5e38c847317b..c1ebb2aa08b5 100644 --- a/net/ceph/messenger_v2.c +++ b/net/ceph/messenger_v2.c @@ -10,7 +10,7 @@ #include #include /* for crypto_memneq() */ #include -#include +#include #include #include #include