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 for Android: free password hash cracker in your pocket

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

Message-ID: <68b54a90-b87c-4b74-a24d-0faaf0f76e2d@intel.com>
Date: Tue, 6 May 2025 17:07:57 +0200
From: "Wysocki, Rafael J" <rafael.j.wysocki@...el.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: Ingo Molnar <mingo@...nel.org>, Linux Kernel Mailing List
	<linux-kernel@...r.kernel.org>, Linux Next Mailing List
	<linux-next@...r.kernel.org>, Srinivas Pandruvada
	<srinivas.pandruvada@...ux.intel.com>
Subject: Re: linux-next: manual merge of the tip tree with the pm tree

Hi,

On 5/1/2025 5:58 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
>    drivers/cpufreq/intel_pstate.c
>
> between commit:
>
>    ac4e04d9e378 ("cpufreq: intel_pstate: Unchecked MSR aceess in legacy mode")

This one has been merged into 6.15-rc5.


> from the pm tree and commit:
>
>    c435e608cf59 ("x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'")

So this one will clash with the mainline now.


> 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.

Thanks for the report!