From: "Wysocki, Rafael J" <rafael.j.wysocki@intel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Daniel Lezcano <daniel.lezcano@linaro•org>,
Zhang Rui <rui.zhang@intel•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
Date: Wed, 25 Jan 2023 12:57:26 +0100 [thread overview]
Message-ID: <bc2f3bec-43c6-ede5-42be-f06babab0ca3@intel.com> (raw)
In-Reply-To: <20230125093933.518d9010@canb.auug.org.au>
On 1/24/2023 11:39 PM, Stephen Rothwell wrote:
> Hi all,
>
> FIXME: Add owner of second tree to To:
> Add author(s)/SOB of conflicting commits.
>
> Today's linux-next merge of the thermal tree got a conflict in:
>
> drivers/thermal/intel/intel_pch_thermal.c
>
> between commit:
>
> fee19c692160 ("thermal: intel: intel_pch: Use generic trip points")
>
> from the pm tree and commit:
>
> 9e631aa90c97 ("thermal/drivers/intel: Use generic trip points for intel_pch")
>
> from the thermal tree.
>
> These commits are very similar, so I just used the former version (since
> it was newer).
Thank you, this is correct.
The linux-next branch in the thermal tree needs to be updated.
Cheers,
Rafael
next prev parent reply other threads:[~2023-01-25 11:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 22:39 linux-next: manual merge of the thermal tree with the pm tree Stephen Rothwell
2023-01-25 11:57 ` Wysocki, Rafael J [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 16:45 Mark Brown
2026-01-27 19:39 ` Wysocki, Rafael J
2024-01-01 23:09 Stephen Rothwell
2023-04-06 0:32 Stephen Rothwell
2023-01-24 22:45 Stephen Rothwell
2023-01-25 11:57 ` Wysocki, Rafael J
2023-01-04 23:10 Stephen Rothwell
2023-01-04 23:35 ` Stephen Rothwell
2023-01-05 14:27 ` Wysocki, Rafael J
2023-01-05 15:30 ` Daniel Lezcano
2023-01-05 20:13 ` Wysocki, Rafael J
2023-01-04 23:03 Stephen Rothwell
2022-11-17 1:29 Stephen Rothwell
2022-11-17 16:18 ` Rafael J. Wysocki
2022-11-27 23:22 ` Stephen Rothwell
2022-11-28 12:51 ` Rafael J. Wysocki
2022-11-28 13:22 ` Daniel Lezcano
2022-11-28 13:48 ` Bagas Sanjaya
2022-11-28 13:54 ` Rafael J. Wysocki
2022-11-28 13:56 ` Daniel Lezcano
2022-11-29 14:32 ` Geert Uytterhoeven
2014-10-10 1:10 Stephen Rothwell
2014-10-10 8:40 ` Zhang Rui
2014-01-06 3:14 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=bc2f3bec-43c6-ede5-42be-f06babab0ca3@intel.com \
--to=rafael.j.wysocki@intel$(echo .)com \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rui.zhang@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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