| commit | c8cab7a98bf8923b6320cf52d0dc3ed56d279a56 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Jan 19 12:58:14 2026 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Jan 19 12:58:14 2026 +0100 |
| tree | e81da7f9ed90f2c0e7a38cb8ac4d19977bfbcbee | |
| parent | fdb12bffad74fa7483f16888d4efa1455a8dbf43 [diff] | |
| parent | 54b3cd55a515c7c0fcfa0c1f0b10d62c11d64bcc [diff] | |
| parent | 2064fe4b8fe0c967dac497c4507f27cba4edf9f4 [diff] |
Merge branches 'pm-powercap' and 'pm-tools' into linux-next * pm-powercap: powercap: intel_rapl: Add PL4 support for Ice Lake powercap: Replace sprintf() with sysfs_emit() in sysfs show functions * pm-tools: tools/power cpupower: Show C0 in idle-info dump tools/power cpupower: Reset errno before strtoull() tools/cpupower: Use strcspn() to strip trailing newline tools/cpupower: Fix inverted APERF capability check cpupower: idle_monitor: fix incorrect value logged after stop