Re: [GIT PULL] hwmon updates for v7.2

[Guenter Roeck]

On 6/15/26 08:59, Guenter Roeck wrote:
> Hi Linus,
>
> Please pull hwmon updates for Linux v7.2 from signed tag:
>
>      git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-for-v7.2

There is going to be a conflict between commit 91660aae2f864 ("x86/msr:
Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()") upstream vs.
commit 4edc7d45abc4b ("hwmon: (coretemp) fix coding style issues").
The conflicting code in hwmon-next replaces

                 "Unable to access MSR 0xEE, for Tjmax, left"
                 " at default\n");
with

		"Unable to access MSR 0xEE, for Tjmax, left at default\n");

so just take the upstream code and replace the two-line text
with the single line.

Thanks,
Guenter