Merge power-supply fixes for 6.6 cycle

Merge power-supply fixes for the 6.6 cycle, so that changes
to the vexpress driver apply cleanly.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

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

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

diff --cc drivers/power/supply/ab8500_btemp.c
Simple merge

diff --cc drivers/power/supply/ab8500_chargalg.c
Simple merge

diff --cc drivers/power/supply/mt6370-charger.c
Simple merge

diff --cc drivers/power/supply/power_supply_sysfs.c
Simple merge

diff --cc drivers/power/supply/rk817_charger.c
Simple merge