Merge tag 'for-v5.16-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jan 2022 19:39:53 +0000 (11:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jan 2022 19:39:53 +0000 (11:39 -0800)
commitd445d649c7929ddafff319ad90e3e190722c685a
treea2ae5e4a92310a891bb6e8d08191246f6ddd033d
parent622e42a674641214034001767334893e2afaeba8
parent644106cdb89844be2496b21175b7c0c2e0fab381
Merge tag 'for-v5.16-rc' of git://git./linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel:
 "Three fixes for the 5.16 cycle:

   - Avoid going beyond last capacity in the power-supply core

   - Replace 1E6L with NSEC_PER_MSEC to avoid floating point calculation
     in LLVM resulting in a build failure

   - Fix ADC measurements in bq25890 charger driver"

* tag 'for-v5.16-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: reset: ltc2952: Fix use of floating point literals
  power: bq25890: Enable continuous conversion for ADC at charging
  power: supply: core: Break capacity loop