diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-03-19 13:25:49 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-03-19 13:25:49 +0100 |
| commit | a6d6590917ec352270bd3e3c040240aab31f2e90 (patch) | |
| tree | db5ffcdae123b3246dd29957d5aa64ab052d203a /kernel | |
| parent | 11703c7611a1f3ca3c89b62bec2dc36503ada7f5 (diff) | |
| parent | 3acec69a94eaaf3d7ebb043e1db45cc26f58a847 (diff) | |
| parent | 52b43bbdb6d8ab73f6f5db1dbcab4e410f58a2f5 (diff) | |
| parent | d61120b4623e24e863a455c1e11085fcb7653d08 (diff) | |
| download | linux-a6d6590917ec352270bd3e3c040240aab31f2e90.tar.gz linux-a6d6590917ec352270bd3e3c040240aab31f2e90.tar.bz2 linux-a6d6590917ec352270bd3e3c040240aab31f2e90.zip | |
Merge branches 'pm-em', 'pm-powercap' and 'pm-sleep'
Merge additional updates related to the Energy Model, power capping
and system-wide power management for 6.9-rc1:
- Modify the Energy Model code to bail out and complain if the unit of
power is not uW to prevent errors due to unit mismatches (Lukasz
Luba).
- Make the intel_rapl platform driver use a remove callback returning
void (Uwe Kleine-König).
- Fix typo in the suspend and interrupts document (Saravana Kannan).
* pm-em:
PM: EM: Force device drivers to provide power in uW
* pm-powercap:
powercap: intel_rapl: Convert to platform remove callback returning void
* pm-sleep:
Documentation: power: Fix typo in suspend and interrupts doc