From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Herbert Xu <herbert@gondor•apana.org.au>,
Linus Torvalds <torvalds@linux-foundation•org>
Cc: Bhoomika K <bhoomikak@vayavyalabs•com>,
Pavitrakumar M <pavitrakumarm@vayavyalabs•com>,
Linux Crypto List <linux-crypto@vger•kernel.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 crypto tree
Date: Mon, 12 Aug 2024 10:42:35 +1000 [thread overview]
Message-ID: <20240812104235.6eefb365@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2107 bytes --]
Hi all,
After merging the crypto tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/crypto/dwc-spacc/spacc_manager.c:5: error: "MIN" redefined [-Werror]
5 | #define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
In file included from include/linux/kernel.h:28,
from include/linux/interrupt.h:6,
from drivers/crypto/dwc-spacc/spacc_core.h:7,
from drivers/crypto/dwc-spacc/spacc_manager.c:3:
include/linux/minmax.h:329: note: this is the location of the previous definition
329 | #define MIN(a,b) __cmp(min,a,b)
|
cc1: all warnings being treated as errors
Caused by commit
c8981d9230d8 ("crypto: spacc - Add SPAcc Skcipher support")
interacting with commit
1a251f52cfdc ("minmax: make generic MIN() and MAX() macros available everywhere")
from Linus' tree (in v6.11-rc2).
I applied the following merge fix patch. I added the include of
minmax.h just in case it was not included implicitly for some other
build config.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 12 Aug 2024 10:36:30 +1000
Subject: [PATCH] fixup for "crypto: spacc - Add SPAcc Skcipher support"
interacting with commit
1a251f52cfdc ("minmax: make generic MIN() and MAX() macros available everywhere")
from Linus' tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/crypto/dwc-spacc/spacc_manager.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/crypto/dwc-spacc/spacc_manager.c b/drivers/crypto/dwc-spacc/spacc_manager.c
index 3b26b27a998f..67c4360334e2 100644
--- a/drivers/crypto/dwc-spacc/spacc_manager.c
+++ b/drivers/crypto/dwc-spacc/spacc_manager.c
@@ -1,9 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
+#include <linux/minmax.h>
#include "spacc_core.h"
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-
/* prevent reading past the end of the buffer */
static void read_from_buf(unsigned char *dst, unsigned char *src,
int off, int n, int max)
--
2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-12 0:42 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 0:42 Stephen Rothwell [this message]
2024-08-13 4:16 ` linux-next: build failure after merge of the crypto tree Herbert Xu
2024-08-13 7:22 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-06 2:22 Stephen Rothwell
2025-05-06 2:33 ` Herbert Xu
2025-04-17 1:52 Stephen Rothwell
2024-03-13 0:57 Stephen Rothwell
2024-03-13 1:43 ` Herbert Xu
2024-03-13 1:45 ` Herbert Xu
2024-03-13 1:58 ` Barry Song
2024-03-13 2:01 ` Eric Biggers
2024-03-13 2:04 ` Herbert Xu
2024-03-13 2:29 ` Eric Biggers
2024-03-13 2:36 ` Herbert Xu
2024-03-13 2:12 ` Barry Song
2024-03-13 2:22 ` Eric Biggers
2023-10-30 4:58 Stephen Rothwell
2023-10-30 5:09 ` Stephen Rothwell
2023-10-30 5:23 ` Herbert Xu
2023-10-30 17:44 ` Dmitry Safonov
2023-10-30 22:02 ` Jakub Kicinski
2023-10-31 4:51 ` Eric Biggers
2023-10-31 20:14 ` Jakub Kicinski
2023-06-26 2:39 Stephen Rothwell
2023-06-26 10:20 ` Herbert Xu
2023-05-22 0:52 Stephen Rothwell
2023-05-22 5:15 ` Herbert Xu
2023-05-23 0:36 ` Stephen Rothwell
2023-04-11 0:48 Stephen Rothwell
2023-04-11 2:22 ` Herbert Xu
2023-01-17 3:47 Stephen Rothwell
2023-01-16 0:29 Stephen Rothwell
2022-12-04 23:48 Stephen Rothwell
2022-12-04 23:52 ` Stephen Rothwell
2022-09-07 1:53 Stephen Rothwell
2022-09-06 1:30 Stephen Rothwell
2022-05-09 11:10 Stephen Rothwell
2022-05-09 12:26 ` Masahiro Yamada
2021-09-27 4:32 Stephen Rothwell
2020-04-21 5:12 Stephen Rothwell
2020-04-22 13:33 ` Herbert Xu
2020-04-17 3:40 Stephen Rothwell
2020-04-17 4:00 ` Shukun Tan
2019-08-12 3:21 Stephen Rothwell
2019-08-12 6:53 ` Zhou Wang
2019-08-05 4:57 Stephen Rothwell
2019-08-05 5:37 ` Chuhong Yuan
2019-08-08 1:52 ` Stephen Rothwell
2019-08-08 3:01 ` Herbert Xu
2019-08-08 3:17 ` Stephen Rothwell
2019-08-08 5:00 ` Herbert Xu
2019-08-08 5:04 ` Stephen Rothwell
2018-10-08 1:03 Stephen Rothwell
2018-10-08 5:54 ` Herbert Xu
2018-05-29 9:08 Stephen Rothwell
2018-05-29 10:16 ` Ondrej Mosnáček
2018-05-29 10:22 ` Stephen Rothwell
2017-11-06 0:25 Stephen Rothwell
2017-11-06 5:40 ` Herbert Xu
2016-11-29 0:55 Stephen Rothwell
2016-11-29 7:08 ` Herbert Xu
2016-11-29 8:34 ` Horia Geantă
2016-11-29 8:43 ` Herbert Xu
2016-07-20 7:46 Stephen Rothwell
2016-07-20 14:32 ` Herbert Xu
2016-06-24 6:20 Stephen Rothwell
2016-06-24 13:33 ` Herbert Xu
2016-06-24 13:36 ` Benedetto, Salvatore
2016-02-17 1:26 Stephen Rothwell
2015-10-15 1:37 Stephen Rothwell
2015-10-15 2:01 ` Herbert Xu
2015-08-05 6:49 Stephen Rothwell
2015-08-05 7:28 ` Herbert Xu
2015-06-20 6:35 Stephen Rothwell
2015-05-28 11:40 Stephen Rothwell
2015-05-28 13:08 ` Stephan Mueller
2015-03-17 2:01 Stephen Rothwell
2015-03-17 11:11 ` Herbert Xu
2014-07-24 3:08 Stephen Rothwell
2014-07-24 7:04 ` Randy Dunlap
2014-07-24 13:37 ` Tom Lendacky
2014-06-23 1:49 Stephen Rothwell
2014-06-23 12:27 ` Herbert Xu
2014-06-23 13:15 ` Stephen Rothwell
2014-06-23 13:40 ` Herbert Xu
2013-12-06 0:45 Stephen Rothwell
2013-05-21 1:45 Stephen Rothwell
2013-05-24 9:57 ` Herbert Xu
2013-05-27 2:19 ` Herbert Xu
2013-05-27 3:43 ` Stephen Rothwell
2013-05-27 3:44 ` Herbert Xu
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=20240812104235.6eefb365@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhoomikak@vayavyalabs$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pavitrakumarm@vayavyalabs$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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