linux-kernel - 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>] [day] [month] [year] [list]

Message-ID: <aXeaN2nPs3EexjXv@sirena.org.uk>
Date: Mon, 26 Jan 2026 16:45:43 +0000
From: Mark Brown <broonie@...nel.org>
To: 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>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
	Romain Gantois <romain.gantois@...tlin.com>
Subject: linux-next: manual merge of the thermal tree with the pm tree

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 fixed it up (see below) 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.

diff --cc tools/lib/thermal/libthermal.pc.template
index b984c5ecd20a9,3b8a24d0a8b8c..0000000000000
--- a/tools/lib/thermal/libthermal.pc.template
+++ b/tools/lib/thermal/libthermal.pc.template

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)