On Wed, 2024-07-17 at 11:41 +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 2 Jul 2024 14:15:55 +1000 Stephen Rothwell
> <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/x86/include/asm/cpufeatures.h
> >
> > between commits:
> >
> > c7107750b2ff ("x86/cpufeatures: Add AMD FAST CPPC feature flag")
> > 7ea81936b853 ("x86/cpufeatures: Add HWP highest perf change
> > feature flag")
> >
> > from the pm tree and commit:
> >
> > 78ce84b9e0a5 ("x86/cpufeatures: Flip the /proc/cpuinfo appearance
> > logic")
> >
> > from the tip tree.
> >
> >
[...]
> > /*
> > * BUG word(s)
>
> This is now a conflict between the pm tree and Linus' tree.
>
linux-next branch of linux-pm tree needs to be rebased to Linus's tree.
This is the diff:
363a364
> #define X86_FEATURE_HWP_HIGHEST_PERF_CHANGE (14*32+15) /* "" HWP
Highest perf change */
472a474
> #define X86_FEATURE_FAST_CPPC (21*32 + 5) /* "" AMD Fast CPPC
*/
Thanks,
Srinivas
