From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Dec 2025 19:31:10 +0000 (+0100)
Subject: Merge branch 'pm-powercap'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=277141a897c715e787f6c51e5db32f2ca90b00dc;p=thirdparty%2Flinux.git

Merge branch 'pm-powercap'

Merge power capping fixes for 6.19-rc2:

 - Fix CPU hotplug locking deadlock reported by lockdep after a recent
   update of the Intel RAPL power capping driver (Srinivas Pandruvada)

 - Fix sscanf() error return value handling in the power capping core
   and a race condition in register_control_type() (Sumeet Pawnikar)

* pm-powercap:
  powercap: intel_rapl: Fix possible recursive lock warning
  powercap: fix sscanf() error return value handling
  powercap: fix race condition in register_control_type()
---

277141a897c715e787f6c51e5db32f2ca90b00dc