From: "Wysocki, Rafael J" <rafael.j.wysocki@intel•com>
To: Mark Brown <broonie@kernel•org>,
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>,
Romain Gantois <romain.gantois@bootlin•com>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
Date: Tue, 27 Jan 2026 20:39:49 +0100 [thread overview]
Message-ID: <79057628-da21-45c9-9391-4f17057b2bd7@intel.com> (raw)
In-Reply-To: <aXeaN2nPs3EexjXv@sirena.org.uk>
On 1/26/2026 5:45 PM, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the thermal tree got a conflict in:
>
> tools/lib/thermal/libthermal.pc.template
>
> between commit:
>
> 5addf72e4f7ef ("tools: lib: thermal: Correct CFLAGS and LDFLAGS in pkg-config template")
>
> from the pm tree and commit:
>
> 965ef09a26f3e ("tools: lib: thermal: Correct CFLAGS and LDFLAGS in pkg-config template")
>
> from the thermal tree.
I'll drop this one.
Thanks!
next prev parent reply other threads:[~2026-01-27 19:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-26 16:45 linux-next: manual merge of the thermal tree with the pm tree Mark Brown
2026-01-27 19:39 ` Wysocki, Rafael J [this message]
-- strict thread matches above, loose matches on Subject: below --
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-24 22:39 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=79057628-da21-45c9-9391-4f17057b2bd7@intel.com \
--to=rafael.j.wysocki@intel$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=romain.gantois@bootlin$(echo .)com \
--cc=rui.zhang@intel$(echo .)com \
/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