Re: linux-next: manual merge of the thermal tree with the pm tree

Wysocki, Rafael J
2026-01-27T19:40:02Z

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!