From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 25 Oct 2024 15:27:19 +0000 (+0200)
Subject: Merge branch 'pm-powercap'
X-Git-Tag: ceph-for-6.13-rc1~139^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1646a3f2b1bda03a763f7aecf83504144fb8bba9;p=ceph-client.git

Merge branch 'pm-powercap'

Merge a dtpm_devfreq power capping driver fix for 6.12-rc5:

 - Fix a dev_pm_qos_add_request() return value check in
   __dtpm_devfreq_setup() to prevent it from failing if
   a positive number is returned (Yuan Can).

* pm-powercap:
  powercap: dtpm_devfreq: Fix error check against dev_pm_qos_add_request()
---

1646a3f2b1bda03a763f7aecf83504144fb8bba9