From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Hongbo Li <lihongbo22@huawei•com>, Kees Cook <kees@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linus Torvalds <torvalds@linux-foundation•org>
Subject: linux-next: build failure after merge of the mm-nonmm-stable tree
Date: Thu, 19 Sep 2024 09:14:46 +1000 [thread overview]
Message-ID: <20240919091446.37087f60@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2249 bytes --]
Hi all,
After merging the mm-nonmm-stable tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/linux/string_helpers.h:7,
from include/linux/seq_file.h:7,
from include/linux/cgroup.h:18,
from include/linux/memcontrol.h:13,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from arch/powerpc/kernel/asm-offsets.c:21:
include/linux/string_choices.h:74:27: error: redefinition of 'str_true_false'
74 | static inline const char *str_true_false(bool v)
| ^~~~~~~~~~~~~~
include/linux/string_choices.h:68:27: note: previous definition of 'str_true_false' with type 'const char *(bool)' {aka 'const char *(_Bool)'}
68 | static inline const char *str_true_false(bool v)
| ^~~~~~~~~~~~~~
Caused by commit
32cebfe1cc21 ("lib/string_choices: add str_true_false()/str_false_true() helper")
merging badly with commit
6ff4cd1160af ("lib/string_choices: Add str_true_false()/str_false_true() helper")
from Linus' tree.
I applied the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 19 Sep 2024 09:07:58 +1000
Subject: [PATCH] fix up for bad merge of "lib/string_choices: add str_true_false()/str_false_true() helper"
which also exists in Linus' tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
include/linux/string_choices.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/include/linux/string_choices.h b/include/linux/string_choices.h
index ef2bb6826919..120ca0f28e95 100644
--- a/include/linux/string_choices.h
+++ b/include/linux/string_choices.h
@@ -71,12 +71,6 @@ static inline const char *str_true_false(bool v)
}
#define str_false_true(v) str_true_false(!(v))
-static inline const char *str_true_false(bool v)
-{
- return v ? "true" : "false";
-}
-#define str_false_true(v) str_true_false(!(v))
-
/**
* str_plural - Return the simple pluralization based on English counts
* @num: Number used for deciding pluralization
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2024-09-18 23:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240919091446.37087f60@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=kees@kernel$(echo .)org \
--cc=lihongbo22@huawei$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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