diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-15 18:53:48 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-15 18:53:48 +0200 |
| commit | 7fae6f8b97ed5f9d60d6af54614724cdca7dc5de (patch) | |
| tree | 363b6d97c4f7b50577883733e8b670d3a47befd9 /scripts/lib/kdoc/kdoc_output.py | |
| parent | Merge branch 'pm-cpufreq' (diff) | |
| parent | cpuidle: teo: Don't count non-existent intercepts (diff) | |
| parent | powercap: idle_inject: Simplify if condition (diff) | |
| download | wireguard-linux-7fae6f8b97ed5f9d60d6af54614724cdca7dc5de.tar.xz wireguard-linux-7fae6f8b97ed5f9d60d6af54614724cdca7dc5de.zip | |
Merge branches 'pm-cpuidle' and 'pm-powercap'
Merge cpuidle and power capping changes for 6.11-rc1:
- Improve the teo cpuidle governor and clean up leftover comments from
the menu cpuidle governor (Christian Loehle).
- Clean up a comment typo in the teo cpuidle governor (Atul Kumar
Pant).
- Add missing MODULE_DESCRIPTION() macro to cpuidle haltpoll (Jeff
Johnson).
- Switch the intel_idle driver to new Intel CPU model defines (Tony
Luck).
- Switch the Intel RAPL driver new Intel CPU model defines (Tony Luck).
- Simplify if condition in the idle_inject driver (Thorsten Blum).
* pm-cpuidle:
cpuidle: teo: Don't count non-existent intercepts
cpuidle: teo: Remove recent intercepts metric
Revert: "cpuidle: teo: Introduce util-awareness"
cpuidle: governors: teo: Fix a typo in a comment
cpuidle: haltpoll: add missing MODULE_DESCRIPTION() macro
cpuidle: menu: Cleanup after loadavg removal
intel_idle: Switch to new Intel CPU model defines
* pm-powercap:
powercap: idle_inject: Simplify if condition
powercap: intel_rapl: Switch to new Intel CPU model defines
powercap: intel_rapl_msr: Switch to new Intel CPU model defines