From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Hans de Goede" <hdegoede@redhat.com>,
"Mark Gross" <markgross@kernel.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"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 drivers-x86 tree with the tip tree
Date: Fri, 9 May 2025 08:38:18 +0200 [thread overview]
Message-ID: <aB2i2oVeGwhaauIU@gmail.com> (raw)
In-Reply-To: <20250509162901.79e269a5@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
> drivers/platform/x86/intel/speed_select_if/isst_if_common.c
>
> between commit:
>
> 6fa17efe4544 ("x86/msr: Rename 'wrmsrl_safe()' to 'wrmsrq_safe()'")
>
> from the tip tree and commit:
>
> c935ddfe65da ("platform/x86: ISST: Do Not Restore SST MSRs on CPU Online Operation")
>
> from the drivers-x86 tree.
>
> I fixed it up (the latter removed the code that the former updated) 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.
LGTM, thanks!
Ingo
next prev parent reply other threads:[~2025-05-09 6:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-09 6:29 linux-next: manual merge of the drivers-x86 tree with the tip tree Stephen Rothwell
2025-05-09 6:38 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-26 4:05 Stephen Rothwell
2020-03-26 8:47 ` Andy Shevchenko
2020-04-01 3:14 ` Stephen Rothwell
2020-04-01 6:49 ` Andy Shevchenko
2018-10-08 3:48 Stephen Rothwell
2018-10-08 10:55 ` Andy Shevchenko
2018-10-08 3:44 Stephen Rothwell
2018-10-08 10:55 ` Andy Shevchenko
2012-03-13 6:51 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=aB2i2oVeGwhaauIU@gmail.com \
--to=mingo@kernel.org \
--cc=hdegoede@redhat.com \
--cc=hpa@zytor.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=peterz@infradead.org \
--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).