From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jeff Layton <jlayton@kernel.org>,
Ilya Dryomov <idryomov@gmail.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Linux Crypto List <linux-crypto@vger.kernel.org>
Cc: Eric Biggers <ebiggers@google.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the ceph tree
Date: Tue, 15 Dec 2020 10:46:24 +1100 [thread overview]
Message-ID: <20201215104624.603c75da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
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 <crypto/sha.h>
| ^~~~~~~~~~~~~~
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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
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 <crypto/aead.h>
#include <crypto/algapi.h> /* for crypto_memneq() */
#include <crypto/hash.h>
-#include <crypto/sha.h>
+#include <crypto/sha2.h>
#include <linux/bvec.h>
#include <linux/crc32c.h>
#include <linux/net.h>
--
2.29.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-12-14 23:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 23:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-09-27 1:31 linux-next: build failure after merge of the ceph tree Stephen Rothwell
2013-09-27 2:36 ` Dave Kleikamp
2013-09-26 1:15 Stephen Rothwell
2013-09-26 1:20 ` majianpeng
2013-09-26 1:26 ` Sage Weil
2012-03-21 1:40 Stephen Rothwell
2012-03-21 4:24 ` Alex Elder
2010-11-16 23:43 Stephen Rothwell
2010-11-17 0:02 ` Sage Weil
2010-09-20 1:41 Stephen Rothwell
2010-09-20 2:53 ` Sage Weil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215104624.603c75da@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ebiggers@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).