diff options
| author | Rafael J. Wysocki <[email protected]> | 2024-03-19 12:25:49 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2024-03-19 12:25:49 +0000 |
| commit | a6d6590917ec352270bd3e3c040240aab31f2e90 (patch) | |
| tree | db5ffcdae123b3246dd29957d5aa64ab052d203a /drivers/cdx/controller/cdx_controller.c | |
| parent | Merge tag 'cpufreq-arm-updates-6.9-2' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | PM: EM: Force device drivers to provide power in uW (diff) | |
| parent | powercap: intel_rapl: Convert to platform remove callback returning void (diff) | |
| parent | Documentation: power: Fix typo in suspend and interrupts doc (diff) | |
| download | kernel-a6d6590917ec352270bd3e3c040240aab31f2e90.tar.gz kernel-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