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

[Stephen Rothwell]

Hi all,

After merging the kspp 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

  6ff4cd1160af ("lib/string_choices: Add str_true_false()/str_false_true() helper")

interacting with commit

  32cebfe1cc21 ("lib/string_choices: add str_true_false()/str_false_true() helper")

from the mm-nonmm-unstable branch of the mm tree.

Git inserted both definitions in my merge.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 6 Sep 2024 17:08:52 +1000
Subject: [PATCH] fix up for "lib/string_choices: Add
 str_true_false()/str_false_true() helper'

merging badly with "lib/string_choices: add
str_true_false()/str_false_true() helper" from the mm tree.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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: pgp5eWhd0ZAl7.pgp
Description: OpenPGP digital signature