diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-10-19 14:43:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-10-19 14:43:43 +0200 |
| commit | 2f0ba6f43afc38207c33db606a99a77703194ff6 (patch) | |
| tree | ad22af089a8c203cf5808f8840a2c01d005730f9 /Documentation/admin-guide | |
| parent | eece15c57944b60b6a90153662db693fab0f47c0 (diff) | |
| parent | bd3135fba0f37e1de31b1e19499660d1aaf9f19e (diff) | |
| parent | 459199ccd1813b0cb9193962a474c2e24b1b373f (diff) | |
Merge branches 'pm-cpuidle' and 'pm-powercap'
Merge cpuidle and power capping updates for 7.4:
- Prevent cpuidle governors menu and teo from returning idle state 0
after it has been disabled (Xueqin Luo)
- Replace min_t() with the better alternatives in the intel_idle driver
and make it use 2-argument strscpy() (Andy Shevchenko)
- Fix two repeated phrase instances in cpuidle (Hemanth Selam, Syazwina
Fazrul)
- Add rugged Panther Lake support to the intel_rapl power capping
driver and make it use %pe for printing error pointers (Srinivas
Pandruvada and Sumeet Pawnikar)
* pm-cpuidle:
Documentation: power/cpuidle: Fix repeating phrase
cpuidle: tegra: fix repeated word 'that' in comment
cpuidle: teo: Do not return a disabled idle state
cpuidle: menu: Do not return a disabled idle state
intel_idle: Use 2-argument strscpy()
intel_idle: Replace min_t() with the better alternatives
* pm-powercap:
powercap: intel_rapl: Use %pe to print error pointers symbolically
powercap: intel_rapl: Add rugged Panther Lake support
