From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Nov 2022 20:59:12 +0000 (-0800)
Subject: Merge tag 'hwmon-for-v6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v6.6.17~6221
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa52994915dca444dbb8e6b91eb82b749ba7a1ec;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'hwmon-for-v6.1-rc4' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Fix two regressions:

   - Commit 54cc3dbfc10d ("hwmon: (pmbus) Add regulator supply into
     macro") resulted in regulator undercount when disabling regulators.
     Revert it.

   - The thermal subsystem rework caused the scmi driver to no longer
     register with the thermal subsystem because index values no longer
     match. To fix the problem, the scmi driver now directly registers
     with the thermal subsystem, no longer through the hwmon core"

* tag 'hwmon-for-v6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  Revert "hwmon: (pmbus) Add regulator supply into macro"
  hwmon: (scmi) Register explicitly with Thermal Framework
---

aa52994915dca444dbb8e6b91eb82b749ba7a1ec