diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2022-02-20 11:07:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2022-02-20 11:07:46 -0800 |
| commit | 70d2bec7c545e06057c5d963b8623e6e234901e8 (patch) | |
| tree | 5d01f13e92f573ab1877075bc19028ce9e9403e3 /Documentation | |
| parent | Merge tag 'fs.mount_setattr.v5.17-rc4' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | power: supply: bq256xx: Handle OOM correctly (diff) | |
| download | linux-70d2bec7c545e06057c5d963b8623e6e234901e8.tar.gz linux-70d2bec7c545e06057c5d963b8623e6e234901e8.tar.bz2 linux-70d2bec7c545e06057c5d963b8623e6e234901e8.zip | |
Merge tag 'for-v5.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply fixes from Sebastian Reichel:
"Three regression fixes for the 5.17 cycle:
- build warning fix for power-supply documentation
- pointer size fix in cw2015 battery driver
- OOM handling in bq256xx charger driver"
* tag 'for-v5.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: supply: bq256xx: Handle OOM correctly
power: supply: core: fix application of sizeof to pointer
power: supply: fix table problem in sysfs-class-power
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-power | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power index fde21d900420..859501366777 100644 --- a/Documentation/ABI/testing/sysfs-class-power +++ b/Documentation/ABI/testing/sysfs-class-power @@ -468,6 +468,7 @@ Description: auto: Charge normally, respect thresholds inhibit-charge: Do not charge while AC is attached force-discharge: Force discharge while AC is attached + ================ ==================================== What: /sys/class/power_supply/<supply_name>/technology Date: May 2007 |