diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-03-11 17:54:23 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-03-11 17:54:23 +0300 |
commit | c907ab55471c5ea07f33d799193cf2f5639d7046 (patch) | |
tree | e52c903789b5e25a37fdc70cdc3adcf26c832403 /drivers | |
parent | 7a8d578350c1d51fc5b597e5553bf79e959b58aa (diff) | |
parent | 44c9cf9aaa48c308b31dba3001d821d74155fc3d (diff) | |
parent | 3208a9a07bd23134eeb4dee10010fa3e7a890457 (diff) | |
download | linux-c907ab55471c5ea07f33d799193cf2f5639d7046.tar.xz |
Merge branches 'pm-powercap' and 'pm-tools'
Merge power capping changes and power management utilities updates for
6.9-rc1:
- Address multiple issues in the TPMI RAPL driver and add support for
new platforms (Lunar Lake-M, Arrow Lake) to Intel RAPL (Zhang Rui).
- Fix freq_qos_add_request() return value check in dtpm_cpu (Daniel
Lezcano).
- Fix kernel-doc for dtpm_create_hierarchy() (Yang Li).
- Fix file leak in get_pkg_num() in x86_energy_perf_policy (Samasth
Norway Ananda).
- Fix cpupower-frequency-info.1 man page typo (Jan Kratochvil).
* pm-powercap:
powercap: dtpm: Fix kernel-doc for dtpm_create_hierarchy() function
powercap: dtpm_cpu: Fix error check against freq_qos_add_request()
powercap: intel_rapl: Add support for Arrow Lake
powercap: intel_rapl: Add support for Lunar Lake-M paltform
powercap: intel_rapl_tpmi: Fix System Domain probing
powercap: intel_rapl_tpmi: Fix a register bug
powercap: intel_rapl: Fix locking in TPMI RAPL
powercap: intel_rapl: Fix a NULL pointer dereference
* pm-tools:
Fix cpupower-frequency-info.1 man page typo
tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()