From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 29 Sep 2025 10:47:06 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle' and 'pm-powercap'
X-Git-Tag: v6.18-rc1~152^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=101642e43de15485cce7ac24ccaf6ab0fd0f0563;p=thirdparty%2Fkernel%2Fstable.git

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
---

101642e43de15485cce7ac24ccaf6ab0fd0f0563