mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] hwmon updates for v7.2
Date: Mon, 15 Jun 2026 16:48:40 -0700	[thread overview]
Message-ID: <3628d678-e2b9-4687-a70b-907daa2055dc@roeck-us.net> (raw)
In-Reply-To: <20260615155926.1959207-1-linux@roeck-us.net>

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


  reply	other threads:[~2026-06-15 23:48 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-15 15:59 Guenter Roeck
2026-06-15 23:48 ` Guenter Roeck [this message]
2026-06-16  2:44 ` pr-tracker-bot

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=3628d678-e2b9-4687-a70b-907daa2055dc@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®