linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: "Wysocki, Rafael J" <rafael.j.wysocki@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Subject: Re: linux-next: manual merge of the tip tree with the pm tree
Date: Tue, 6 May 2025 19:43:15 +0200	[thread overview]
Message-ID: <aBpKM62SYYW_B6Nx@gmail.com> (raw)
In-Reply-To: <68b54a90-b87c-4b74-a24d-0faaf0f76e2d@intel.com>


* Wysocki, Rafael J <rafael.j.wysocki@intel.com> wrote:

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

Yeah - and I resolved it in tip:x86/msr:

  commit 570d58b12fbf7bae0ba72d929ccf914a4df5ca7c (HEAD -> x86/msr)
  Merge: 502ad6e5a619 92a09c47464d
  Author: Ingo Molnar <mingo@kernel.org>
  Date:   Tue May 6 19:42:00 2025 +0200

    Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts
    
     Conflicts:
            drivers/cpufreq/intel_pstate.c
    
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

So all should be good at this stage.

Thanks,

	Ingo

  reply	other threads:[~2025-05-06 17:43 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-01  3:58 linux-next: manual merge of the tip tree with the pm tree Stephen Rothwell
2025-05-06 15:07 ` Wysocki, Rafael J
2025-05-06 17:43   ` Ingo Molnar [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-16  6:15 Stephen Rothwell
2025-05-16  7:54 ` Ingo Molnar
2025-05-16  9:54   ` Stephen Rothwell
2025-05-16 12:45     ` Ingo Molnar
2025-05-28  3:52 ` Stephen Rothwell
2025-05-12  4:55 Stephen Rothwell
2025-05-12  5:23 ` Stephen Rothwell
2025-05-12 20:45   ` Mario Limonciello
2025-05-15 15:49     ` Ingo Molnar
2025-05-15 15:50       ` Mario Limonciello
2025-05-28  3:50   ` Stephen Rothwell
2025-05-28 14:14     ` Limonciello, Mario
2025-05-28 22:12       ` Stephen Rothwell
2025-04-17  3:43 Stephen Rothwell
2025-04-17 11:22 ` Ingo Molnar
2024-07-02  4:15 Stephen Rothwell
2024-07-02  9:25 ` Borislav Petkov
2024-07-17  1:41 ` Stephen Rothwell
2024-07-17  2:33   ` srinivas pandruvada
2024-07-17  9:49     ` Borislav Petkov
2024-06-24 17:06 Mark Brown
2024-06-25  3:00 ` Xiaojian Du
2024-06-25  4:25   ` Borislav Petkov
2024-06-25  4:51     ` Xiaojian Du
2021-02-17  5:07 Stephen Rothwell
2021-02-17 10:15 ` Andy Shevchenko
2021-02-22  0:34 ` Stephen Rothwell
2018-10-08  2:44 Stephen Rothwell
2018-10-08 10:06 ` Rafael J. Wysocki
2018-10-08 10:34   ` Andy Shevchenko
2018-10-08  2:40 Stephen Rothwell
2018-10-08 10:05 ` Rafael J. Wysocki
2018-10-08 10:41   ` Andy Shevchenko
2018-03-23  2:20 Stephen Rothwell
2018-03-23  6:09 ` Ingo Molnar
2018-03-23 21:09   ` Rafael J. Wysocki
2018-03-24  8:15     ` Ingo Molnar
2017-11-06  2:10 Stephen Rothwell
2017-11-06 13:09 ` Rafael J. Wysocki
2017-08-11  4:06 Stephen Rothwell
2017-09-04  4:43 ` Stephen Rothwell
2016-11-22  5:48 Stephen Rothwell
2016-06-09  4:34 Stephen Rothwell
2016-04-19  2:59 Stephen Rothwell
2016-03-15  1:55 Stephen Rothwell
2016-03-11  1:57 Stephen Rothwell
2016-03-11 13:51 ` Rafael J. Wysocki
2016-02-29  4:42 Stephen Rothwell
2015-10-06  3:07 Stephen Rothwell
2015-03-31  7:58 Stephen Rothwell
2015-03-31 22:23 ` Rafael J. Wysocki
2015-03-31  7:10 Stephen Rothwell
2014-12-15  2:30 Stephen Rothwell
2014-11-25  5:46 Stephen Rothwell
2014-11-25 21:16 ` Rafael J. Wysocki
2014-08-04  6:55 Stephen Rothwell
2014-05-09  4:49 Stephen Rothwell
2014-01-13  3:29 Stephen Rothwell
2014-01-07  4:20 Stephen Rothwell
2014-01-06  7:18 Stephen Rothwell
2013-08-19  4:09 Stephen Rothwell
2013-04-11  4:08 Stephen Rothwell

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=aBpKM62SYYW_B6Nx@gmail.com \
    --to=mingo@kernel.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=sfr@canb.auug.org.au \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).