Merge branch 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Dec 2023 20:07:55 +0000 (21:07 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Dec 2023 20:07:55 +0000 (21:07 +0100)
commita6b31256928d78204f8f282220d3b0d64387f79d
tree594a1ee6cf2ec922d552f209cf5a81e4a08b30f6
parent142c169b31beb364ef39385b4e88735bd51d37fe
parentb817f1488fca548fe50e2654d84a1956a16a1a8a
Merge branch 'powercap'

Merge a power capping fix for 6.7-rc4 which eliminates unnecessary
and harmful conversions to uW from the DTPM (dynamic thermal and power
management) framework (Lukasz Luba).

* powercap:
  powercap: DTPM: Fix unneeded conversions to micro-Watts