Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/bd718x7-regulator.c
Simple merge

diff --cc drivers/regulator/hi6421v600-regulator.c
Simple merge

diff --cc drivers/regulator/scmi-regulator.c
Simple merge

diff --cc include/linux/mfd/rohm-bd71828.h
Simple merge