linux-next: build failure after merge of the ceph tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
 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: pgpR9N9lQCSSJ.pgp
Description: OpenPGP digital signature