From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Lucas De Marchi" <lucas.demarchi@intel•com>,
"Thomas Hellström" <thomas.hellstrom@linux•intel.com>
Cc: Kees Cook <kees@kernel•org>, Riana Tauro <riana.tauro@intel•com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>,
Michal Wajdeczko <michal.wajdeczko@intel•com>,
DRM XE List <intel-xe@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Dave Airlie <airlied@redhat•com>,
DRI <dri-devel@lists•freedesktop.org>
Subject: Re: linux-next: build failure after merge of the kspp tree
Date: Thu, 19 Sep 2024 09:27:52 +1000 [thread overview]
Message-ID: <20240919092752.5a832aaa@canb.auug.org.au> (raw)
In-Reply-To: <20240909195939.067c1c13@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2233 bytes --]
Hi all,
On Mon, 9 Sep 2024 19:59:39 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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@canb•auug.org.au>
> 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@canb•auug.org.au>
> ---
> 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
This is now needed in the merge between Linus' tree and the drm-xe tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-09-18 23:27 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 9:59 linux-next: build failure after merge of the kspp tree Stephen Rothwell
2024-09-18 23:27 ` Stephen Rothwell [this message]
2024-09-20 3:43 ` Lucas De Marchi
-- strict thread matches above, loose matches on Subject: below --
2025-07-18 10:40 Stephen Rothwell
2025-07-20 6:04 ` Kees Cook
2024-09-06 7:12 Stephen Rothwell
2024-08-06 4:54 Stephen Rothwell
2024-03-05 3:50 Stephen Rothwell
2024-03-05 9:54 ` Kees Cook
2023-09-14 1:50 Stephen Rothwell
2023-09-14 3:07 ` Kees Cook
2023-01-05 2:25 Stephen Rothwell
2023-01-05 3:22 ` Kees Cook
2023-01-05 4:24 ` Stephen Rothwell
2022-12-01 3:07 Stephen Rothwell
2022-12-01 16:31 ` Kees Cook
2022-07-28 10:55 Stephen Rothwell
2022-07-28 15:12 ` Matthias Kaehlcke
2022-05-05 7:40 Stephen Rothwell
2022-05-07 17:18 ` Kees Cook
2022-03-16 7:32 Stephen Rothwell
2022-03-17 1:01 ` Linus Walleij
2022-03-17 8:24 ` Marc Zyngier
2022-03-09 10:10 Stephen Rothwell
2022-03-09 16:52 ` Kees Cook
2022-03-09 16:58 ` Hans de Goede
2022-03-09 17:18 ` Kees Cook
2022-02-28 22:27 Stephen Rothwell
2022-02-28 23:02 ` Kees Cook
2022-03-02 9:16 ` Stephen Rothwell
2022-03-03 7:29 ` Stephen Rothwell
2022-01-30 23:09 Stephen Rothwell
2022-01-31 4:04 ` Kees Cook
2022-01-31 4:59 ` Stephen Rothwell
2022-01-31 6:19 ` Kees Cook
2022-01-31 19:10 ` Saeed Mahameed
2022-01-31 21:06 ` Kees Cook
2022-01-30 22:34 Stephen Rothwell
2022-01-30 23:24 ` Herbert Xu
2022-01-31 0:15 ` Stephen Rothwell
2022-01-31 0:20 ` Herbert Xu
2022-01-31 0:41 ` Stephen Rothwell
2022-01-25 3:50 Stephen Rothwell
2022-01-25 7:44 ` Kees Cook
2022-01-25 13:27 ` Masami Hiramatsu
2022-01-25 14:01 ` Steven Rostedt
2022-01-25 17:53 ` Kees Cook
2022-01-25 14:31 ` Masami Hiramatsu
2022-01-25 15:49 ` Steven Rostedt
2022-01-25 17:54 ` Kees Cook
2022-01-25 18:41 ` Steven Rostedt
2022-01-25 20:57 ` Kees Cook
2022-01-25 21:23 ` Steven Rostedt
2022-01-25 21:28 ` Steven Rostedt
2022-01-25 22:07 ` Kees Cook
2022-01-25 22:21 ` Steven Rostedt
2022-01-26 0:35 ` Masami Hiramatsu
2022-01-26 1:16 ` Steven Rostedt
2022-01-26 3:18 ` Kees Cook
2022-01-26 3:26 ` Steven Rostedt
2022-01-26 19:41 ` Beau Belgrave
2022-01-26 21:00 ` Steven Rostedt
2022-01-26 3:52 ` Masami Hiramatsu
2022-01-26 4:06 ` Steven Rostedt
2022-01-26 3:17 ` Kees Cook
2022-01-25 22:01 ` Kees Cook
2022-01-25 3:24 Stephen Rothwell
2022-01-25 3:43 ` Kees Cook
2022-02-08 4:42 ` Stephen Rothwell
2022-02-08 6:13 ` Kees Cook
2022-01-25 2:55 Stephen Rothwell
2022-01-25 3:02 ` Stephen Rothwell
2022-01-25 3:22 ` Kees Cook
2022-01-25 0:57 Stephen Rothwell
2022-01-25 3:35 ` Kees Cook
2022-01-25 14:07 ` David Sterba
2021-09-16 3:34 Stephen Rothwell
2021-09-16 6:00 ` Kees Cook
2021-08-26 7:52 Stephen Rothwell
2021-08-26 15:38 ` Kees Cook
2020-06-23 3:51 Stephen Rothwell
2020-06-23 3:56 ` David Miller
2020-06-21 13:48 Stephen Rothwell
2020-06-21 15:36 ` Kees Cook
2018-07-27 9:02 Stephen Rothwell
2018-07-27 9:06 ` Stephen Rothwell
2018-07-27 10:55 ` Stephen Rothwell
2018-07-27 12:55 ` Will Deacon
2018-07-27 13:01 ` Will Deacon
2018-07-27 13:27 ` Will Deacon
2018-07-27 16:00 ` Kees Cook
2018-07-30 7:33 ` Stephen Rothwell
2018-07-30 14:47 ` Laura Abbott
2018-07-30 16:37 ` Will Deacon
2018-07-31 10:09 ` Will Deacon
2018-07-31 11:27 ` Stephen Rothwell
2017-11-08 5:23 Stephen Rothwell
2017-11-08 23:43 ` Kees Cook
2017-11-09 0:18 ` Darrick J. Wong
2017-11-09 0:31 ` Kees Cook
2017-06-20 4:56 Stephen Rothwell
2017-06-20 5:39 ` Kees Cook
2017-06-20 5:42 ` John Johansen
2017-06-20 5:39 ` John Johansen
2017-06-26 18:19 ` Kees Cook
2017-06-27 3:33 ` James Morris
2017-06-27 22:16 ` Kees Cook
2017-06-28 5:48 ` James Morris
2017-06-16 1:30 Stephen Rothwell
2017-06-16 2:51 ` Daniel Micay
2017-06-16 2:52 ` Daniel Micay
2017-06-16 3:20 ` Kees Cook
2017-06-16 3:31 ` Stephen Rothwell
2017-06-19 0:23 ` Stephen Rothwell
2017-06-19 21:01 ` Kees Cook
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=20240919092752.5a832aaa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-xe@lists$(echo .)freedesktop.org \
--cc=kees@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@intel$(echo .)com \
--cc=michal.wajdeczko@intel$(echo .)com \
--cc=riana.tauro@intel$(echo .)com \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=thomas.hellstrom@linux$(echo .)intel.com \
/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