From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 7 Aug 2026 20:07:04 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'pm-runtime', 'pm-powercap' and 'pm-tools'
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=7544a367adc1ce5e9cc62315b4c32dc72b509451;p=thirdparty%2Flinux.git

Merge branches 'pm-sleep', 'pm-runtime', 'pm-powercap' and 'pm-tools'

Merge updates related to system sleep handling and runtime PM, a power
capping update, and power management tools updates for 7.3-rc1:

 - Rename the PM core module parameter prefix to "pm" and allow the PM
   transition (DPM) watchdog to be disabled by default (Tzung-Bi Shih)

 - Fix off-by-one in wakelocks number limit check in the system sleep
   sysfs interface (Haowen Tu)

 - Remove kernel-doc markings from helper descriptions in the core
   hibernation code (Adi Nata)

 - Use %pe to print error pointer values in the hibernation core (Ronan
   Marchal)

 - Fix memory leak in snapshot_write_next() error path (Malaya Kumar
   Rout)

 - Delay allocating and linking the next swap_map_page in the
   hibernation image saving code until another image page actually
   needs to be recorded (Haesung Kim)

 - Stop setting runtime_error on runtime resume callback failures to
   allow drivers to recover from resume issues (Praveen Talari)

 - Handle PMU registration failure during probe in the intel_rapl_tpmi
   driver (Sumeet Pawnikar)

 - Avoid optional imports in intel_pstate_tracer unless they are really
   needed (Yousef Alhouseen)

 - Add generic CPPC performance display to the cpupower utility, build
   and call CPPC information on non-AMD processors, make cpupower print
   kernel and hardware frequency information, and add libm to cpupower
   for generic CPPC view (Jeremy Linton)

 - Remove conditional return with no effect from cpupower (Sang-Heon
   Jeon)

* pm-sleep:
  PM: sleep: Allow disabling DPM watchdog by default
  PM: sleep: Rename module parameters prefix to "pm"
  PM: hibernate: swap: defer linking the next map page
  PM: hibernate: Fix memory leak in snapshot_write_next() error path
  PM: hibernate: Use %pe to print error pointer values
  PM: hibernate: Remove kernel-doc markings from helper descriptions
  PM: sleep: Fix off-by-one in wakelocks number limit check

* pm-runtime:
  PM: runtime: Only set runtime_error on suspend callback failures

* pm-powercap:
  powercap: intel_rapl_tpmi: Handle PMU registration failure during probe

* pm-tools:
  cpupower: remove conditional return with no effect
  tools/power: intel_pstate_tracer: avoid optional imports for help
  cpupower: Add libm to cpupower for generic CPPC view
  cpupower: Print kernel and hardware frequency information
  cpupower: Build and call CPPC information on non-AMD processors
  cpupower: Add generic CPPC performance display
---

7544a367adc1ce5e9cc62315b4c32dc72b509451