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

[Stephen Rothwell]

Hi all,

After merging the kspp tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/xe/xe_gt_idle.c:56:27: error: redefinition of 'str_up_down'
   56 | static inline const char *str_up_down(bool v)
      |                           ^~~~~~~~~~~
In file included from include/linux/string_helpers.h:7,
                 from drivers/gpu/drm/xe/xe_assert.h:9,
                 from drivers/gpu/drm/xe/xe_force_wake.h:9,
                 from drivers/gpu/drm/xe/xe_gt_idle.c:8:
include/linux/string_choices.h:62:27: note: previous definition of 'str_up_down' with type 'const char *(bool)' {aka 'const char *(_Bool)'}
   62 | static inline const char *str_up_down(bool v)
      |                           ^~~~~~~~~~~

Caused by commit

  a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")

interacting with commit

  0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")

from the drm-xe tree.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 9 Sep 2024 19:40:17 +1000
Subject: [PATCH] fix up for "lib/string_choices: Add str_up_down() helper"

interacting wit commit "drm/xe/xe_gt_idle: add debugfs entry for
powergating info" from the drm-xe tree.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/gpu/drm/xe/xe_gt_idle.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
index 85a35ed153a3..0f98c1539c64 100644
--- a/drivers/gpu/drm/xe/xe_gt_idle.c
+++ b/drivers/gpu/drm/xe/xe_gt_idle.c
@@ -53,11 +53,6 @@ pc_to_xe(struct xe_guc_pc *pc)
 	return gt_to_xe(gt);
 }
 
-static inline const char *str_up_down(bool v)
-{
-	return v ? "up" : "down";
-}
-
 static const char *gt_idle_state_to_string(enum xe_gt_idle_state state)
 {
 	switch (state) {
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgp4kvINi7NIh.pgp
Description: OpenPGP digital signature