From: Linus Torvalds Date: Fri, 23 May 2025 16:47:43 +0000 (-0700) Subject: Merge tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... X-Git-Tag: v6.15~7 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7586ac7c340c3672f116052c1d150f134810965b;p=linux-block.git Merge tag 'thermal-6.15-rc8' of git://git./linux/kernel/git/rafael/linux-pm Pull thermal control fix from Rafael Wysocki: "This fixes a coding mistake in the x86_pkg_temp_thermal Intel thermal driver that was introduced by an incorrect conflict resolution during a merge (Zhang Rui)" * tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature --- 7586ac7c340c3672f116052c1d150f134810965b