linux-kernel - Re: linux-next: manual merge of the tip tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <38ff1530e63a1659f35c3a0ff315b17b65f2dbd5.camel@linux.intel.com>
Date: Tue, 16 Jul 2024 19:33:12 -0700
From: srinivas pandruvada <srinivas.pandruvada@...ux.intel.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Thomas Gleixner
 <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin"
 <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, "Rafael J. Wysocki"
 <rjw@...ysocki.net>
Cc: "Borislav Petkov (AMD)" <bp@...en8.de>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Mario Limonciello
 <mario.limonciello@....com>,  Perry Yuan <perry.yuan@....com>, "Rafael J.
 Wysocki" <rafael.j.wysocki@...el.com>, Xiaojian Du <Xiaojian.Du@....com>
Subject: Re: linux-next: manual merge of the tip tree with the pm tree

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@...b.auug.org.au> 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