Merge tag 'for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

Pull power supply and reset updates from Sebastian Reichel:
 "Nothing special for the power-supply subystem this time.

   - power-supply core: remove faulty cooling logic

   - convert all sysfs show() handlers from *printf() use sysfs_emit()

   - bq25890: add dual-charger support required by Lenovo Yoga Tab 3 Pro

   - bq27xxx: fix reporting critical level

   - syscon-reboot: add priority property support

   - new rt9467 charger driver

   - new rt9471 charger driver

   - new Odroid Go Ultra poweroff driver

   - misc minor fixes and cleanups"

* tag 'for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (32 commits)
  power: reset: odroid-go-ultra: fix I2C dependency
  power: supply: leds: explicitly include linux/leds.h
  dt-bindings: power: supply: pm8941-coincell: Don't require charging properties
  dt-bindings: power: supply: pm8941-coincell: Add PM8998 compatible
  power: reset: add Odroid Go Ultra poweroff driver
  power: supply: rt9467: Fix spelling mistake "attache" -> "attach"
  power: supply: rt9471: fix using wrong ce_gpio in rt9471_probe()
  power: supply: max77650: Make max77650_charger_disable() return void
  Documentation: power: rt9467: Document exported sysfs entries
  power: supply: rt9467: Add Richtek RT9467 charger driver
  dt-bindings: power: supply: Add Richtek RT9467 battery charger
  Documentation: power: rt9471: Document exported sysfs entries
  power: supply: rt9471: Add Richtek RT9471 charger driver
  dt-bindings: power: supply: Add Richtek RT9471 battery charger
  power: supply: max1721x: Use strscpy() is more robust and safer
  power: supply: test-power: use strscpy() instead of strncpy()
  power: supply: bq27xxx: fix reporting critical level
  power: supply: bq256xx: Init ichg/vbat value with chip default value
  power: supply: collie_battery: Convert to GPIO descriptors (part 2)
  power: supply: remove faulty cooling logic
  ...

diff --cc drivers/power/supply/Kconfig
Simple merge

diff --cc drivers/power/supply/Makefile
index 8cb3c7f5c111f0f7573234e6faf7825a6e89d929,f8f9716d3ba4efe2612a9d7def585cb1097bfa3e..3aec9bc10f3c94b16dac49d45ba61dca5074456c
--- 1/drivers/power/supply/Makefile
--- 2/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@@ -52,8 -54,12 +52,10 @@@ obj-$(CONFIG_BATTERY_DA9150)        += da9150-
  obj-$(CONFIG_BATTERY_MAX17040)        += max17040_battery.o
  obj-$(CONFIG_BATTERY_MAX17042)        += max17042_battery.o
  obj-$(CONFIG_BATTERY_MAX1721X)        += max1721x_battery.o
 -obj-$(CONFIG_BATTERY_Z2)      += z2_battery.o
  obj-$(CONFIG_BATTERY_RT5033)  += rt5033_battery.o
  obj-$(CONFIG_CHARGER_RT9455)  += rt9455_charger.o
 -obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
+ obj-$(CONFIG_CHARGER_RT9467)  += rt9467-charger.o
+ obj-$(CONFIG_CHARGER_RT9471)  += rt9471.o
  obj-$(CONFIG_BATTERY_TWL4030_MADC)    += twl4030_madc_battery.o
  obj-$(CONFIG_CHARGER_88PM860X)        += 88pm860x_charger.o
  obj-$(CONFIG_CHARGER_PCF50633)        += pcf50633-charger.o