Merge remote-tracking branch 'regulator/for-5.11' into regulator-next

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/core.c
index 42bbd99a36acff6b44754066700e270cc58f09c5,2d5d5f3bac6243d7ff9ad02a63e22fa513acf655..ca03d8e70bd1359f586e82aaa75878ecf58f75c7
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -5305,9 -5309,11 +5315,11 @@@ regulator_register(const struct regulat
                /* FIXME: this currently triggers a chicken-and-egg problem
                 * when creating -SUPPLY symlink in sysfs to a regulator
                 * that is just being created */
+               rdev_dbg(rdev, "will resolve supply early: %s\n",
+                        rdev->supply_name);
                ret = regulator_resolve_supply(rdev);
                if (!ret)
 -                      ret = set_machine_constraints(rdev, constraints);
 +                      ret = set_machine_constraints(rdev);
                else
                        rdev_dbg(rdev, "unable to resolve supply early: %pe\n",
                                 ERR_PTR(ret));

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