From: Ingo Molnar <mingo@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>,
"Ahmed S. Darwish" <darwi@linutronix•de>,
Artem Bityutskiy <artem.bityutskiy@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Subject: Re: linux-next: manual merge of the tip tree with the pm tree
Date: Fri, 16 May 2025 09:54:35 +0200 [thread overview]
Message-ID: <aCbvO5Q0B3yYxji4@gmail.com> (raw)
In-Reply-To: <20250516161541.0cff29b8@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/idle/intel_idle.c
>
> between commit:
>
> 6138f3451516 ("intel_idle: Add C1 demotion on/off sysfs knob")
>
> from the pm tree and commit:
>
> 968e30006807 ("x86/cpuid: Set <asm/cpuid/api.h> as the main CPUID header")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/idle/intel_idle.c
> index 3292bf74e3c2,433d858b7be1..000000000000
> --- a/drivers/idle/intel_idle.c
> +++ b/drivers/idle/intel_idle.c
> @@@ -52,8 -51,7 +52,8 @@@
> #include <linux/notifier.h>
> #include <linux/cpu.h>
> #include <linux/moduleparam.h>
> +#include <linux/sysfs.h>
> - #include <asm/cpuid.h>
> + #include <asm/cpuid/api.h>
> #include <asm/cpu_device_id.h>
> #include <asm/intel-family.h>
> #include <asm/mwait.h>
So I don't think the <asm/cpuid.h> change is needed - the header still
fully exists:
starship:~/tip> ls -lh arch/x86/include/asm/cpuid/api.h arch/x86/include/asm/cpuid.h
-rw-rw-r-- 1 mingo mingo 6.1K May 16 09:34 arch/x86/include/asm/cpuid/api.h
-rw-rw-r-- 1 mingo mingo 149 May 16 09:34 arch/x86/include/asm/cpuid.h
And the <linux/sysfs.h> addition is probably a build fix for the PM
tree? The <asm/cpuid.h> header's indirect header dependencies did not
change. Should probably not be carried in -next, as this masks a build
failure that will then trigger in Linus's tree?
(Unless I'm missing something that is.)
Thanks,
Ingo
next prev parent reply other threads:[~2025-05-16 7:54 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-16 6:15 linux-next: manual merge of the tip tree with the pm tree Stephen Rothwell
2025-05-16 7:54 ` Ingo Molnar [this message]
2025-05-16 9:54 ` Stephen Rothwell
2025-05-16 12:45 ` Ingo Molnar
2025-05-28 3:52 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-06-03 13:32 Mark Brown
2026-06-04 12:33 ` Frederic Weisbecker
2026-05-25 14:16 Mark Brown
2026-02-04 13:52 Mark Brown
2026-02-04 14:48 ` Wysocki, Rafael J
2026-02-04 14:56 ` Sebastian Andrzej Siewior
2025-05-12 4:55 Stephen Rothwell
2025-05-12 5:23 ` Stephen Rothwell
2025-05-12 20:45 ` Mario Limonciello
2025-05-15 15:49 ` Ingo Molnar
2025-05-15 15:50 ` Mario Limonciello
2025-05-28 3:50 ` Stephen Rothwell
2025-05-28 14:14 ` Limonciello, Mario
2025-05-28 22:12 ` Stephen Rothwell
2025-05-01 3:58 Stephen Rothwell
2025-05-06 15:07 ` Wysocki, Rafael J
2025-05-06 17:43 ` Ingo Molnar
2025-04-17 3:43 Stephen Rothwell
2025-04-17 11:22 ` Ingo Molnar
2024-07-02 4:15 Stephen Rothwell
2024-07-02 9:25 ` Borislav Petkov
2024-07-17 1:41 ` Stephen Rothwell
2024-07-17 2:33 ` srinivas pandruvada
2024-07-17 9:49 ` Borislav Petkov
2024-06-24 17:06 Mark Brown
2024-06-25 3:00 ` Xiaojian Du
2024-06-25 4:25 ` Borislav Petkov
2024-06-25 4:51 ` Xiaojian Du
2021-02-17 5:07 Stephen Rothwell
2021-02-17 10:15 ` Andy Shevchenko
2021-02-22 0:34 ` Stephen Rothwell
2018-10-08 2:44 Stephen Rothwell
2018-10-08 10:06 ` Rafael J. Wysocki
2018-10-08 10:34 ` Andy Shevchenko
2018-10-08 2:40 Stephen Rothwell
2018-10-08 10:05 ` Rafael J. Wysocki
2018-10-08 10:41 ` Andy Shevchenko
2018-03-23 2:20 Stephen Rothwell
2018-03-23 6:09 ` Ingo Molnar
2018-03-23 21:09 ` Rafael J. Wysocki
2018-03-24 8:15 ` Ingo Molnar
2017-11-06 2:10 Stephen Rothwell
2017-11-06 13:09 ` Rafael J. Wysocki
2017-08-11 4:06 Stephen Rothwell
2017-09-04 4:43 ` Stephen Rothwell
2016-11-22 5:48 Stephen Rothwell
2016-06-09 4:34 Stephen Rothwell
2016-04-19 2:59 Stephen Rothwell
2016-03-15 1:55 Stephen Rothwell
2016-03-11 1:57 Stephen Rothwell
2016-03-11 13:51 ` Rafael J. Wysocki
2016-02-29 4:42 Stephen Rothwell
2015-10-06 3:07 Stephen Rothwell
2015-03-31 7:58 Stephen Rothwell
2015-03-31 22:23 ` Rafael J. Wysocki
2015-03-31 7:10 Stephen Rothwell
2014-12-15 2:30 Stephen Rothwell
2014-11-25 5:46 Stephen Rothwell
2014-11-25 21:16 ` Rafael J. Wysocki
2014-08-04 6:55 Stephen Rothwell
2014-05-09 4:49 Stephen Rothwell
2014-01-13 3:29 Stephen Rothwell
2014-01-07 4:20 Stephen Rothwell
2014-01-06 7:18 Stephen Rothwell
2013-08-19 4:09 Stephen Rothwell
2013-04-11 4:08 Stephen Rothwell
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=aCbvO5Q0B3yYxji4@gmail.com \
--to=mingo@kernel$(echo .)org \
--cc=artem.bityutskiy@linux$(echo .)intel.com \
--cc=darwi@linutronix$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=rjw@rjwysocki$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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