diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-09-29 12:47:06 +0200 | 
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-09-29 12:47:06 +0200 | 
| commit | 101642e43de15485cce7ac24ccaf6ab0fd0f0563 (patch) | |
| tree | cfaf3e4c2457616a0be38a1cb064d6a69c607b82 /drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | |
| parent | d6fd599cd4d8afb604d5c0b5f5d20a1484942eef (diff) | |
| parent | 7b1b7961170e4fcad488755e5ffaaaf9bd527e8f (diff) | |
| parent | 03cf825911c95f39d77d2a60b35fe5b4a33115b1 (diff) | |
Merge branches 'pm-cpuidle' and 'pm-powercap'
Merge cpuidle and power capping changes for 6.18-rc1:
 - Fail cpuidle device registration if there is one already to avoid
   sysfs-related issues (Rafael Wysocki)
 - Use sysfs_emit()/sysfs_emit_at() instead of sprintf()/scnprintf() in
   cpuidle (Vivek Yadav)
 - Fix device and OF node leaks at probe in the qcom-spm cpuidle driver
   and drop unnecessary initialisations from it (Johan Hovold)
 - Remove unnecessary address-of operators from the intel_idle cpuidle
   driver (Kaushlendra Kumar)
 - Rearrange main loop in menu_select() to make the code in that funtion
   easier to follow (Rafael Wysocki)
 - Convert values in microseconds to ktime using us_to_ktime() where
   applicable in the intel_idle power capping driver (Xichao Zhao)
* pm-cpuidle:
  cpuidle: Fail cpuidle device registration if there is one already
  cpuidle: sysfs: Use sysfs_emit()/sysfs_emit_at() instead of sprintf()/scnprintf()
  cpuidle: qcom-spm: drop unnecessary initialisations
  cpuidle: qcom-spm: fix device and OF node leaks at probe
  intel_idle: Remove unnecessary address-of operators
  cpuidle: governors: menu: Rearrange main loop in menu_select()
* pm-powercap:
  powercap: idle_inject: use us_to_ktime() where appropriate
