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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <79057628-da21-45c9-9391-4f17057b2bd7@intel.com>
Date: Tue, 27 Jan 2026 20:39:49 +0100
From: "Wysocki, Rafael J" <rafael.j.wysocki@...el.com>
To: Mark Brown <broonie@...nel.org>, Daniel Lezcano
	<daniel.lezcano@...aro.org>, Zhang Rui <rui.zhang@...el.com>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, "Linux Next
 Mailing List" <linux-next@...r.kernel.org>, Romain Gantois
	<romain.gantois@...tlin.com>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree

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!