From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jan 2022 19:39:53 +0000 (-0800)
Subject: Merge tag 'for-v5.16-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Tag: baikal/aarch64/sdk6.1~5008
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=3b5f958842d441fd44a526a632b332598b8c3443;p=kernel.git

Merge tag 'for-v5.16-rc' of git://git.kernel.org/pub/scm/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
---

3b5f958842d441fd44a526a632b332598b8c3443