From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Jan 2021 19:22:30 +0000 (-0800)
Subject: Merge tag 'hwmon-for-v5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~8107
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ff90100ace886895e4fbb2850b8d5e49d931ed6;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'hwmon-for-v5.11-rc3' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Fix possible KASAN issue in amd_energy driver

 - Avoid configuration problem in pwm-fan driver

 - Fix kernel-doc warning in sbtsi_temp documentation

* tag 'hwmon-for-v5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (amd_energy) fix allocation of hwmon_channel_info config
  hwmon: (pwm-fan) Ensure that calculation doesn't discard big period values
  hwmon: (sbtsi_temp) Fix Documenation kernel-doc warning
---

2ff90100ace886895e4fbb2850b8d5e49d931ed6