pinebook pro installer fails to build (again)

In order to test my modifications, I tried to build an installer for Pinebook Pro. The build failed with a patch being rejected.

The rejected patch was this one:

...
|----------- delimiter ----------- "patching" "succeeded general-increasing_DMA_block_memory_allocation_to_2048.patch" -----------|
1 out of 1 hunk FAILED -- saving rejects to file drivers/regulator/core.c.rej
# cat ./build/source/linux-next/drivers/regulator/core.c.rej
--- drivers/regulator/core.c
+++ drivers/regulator/core.c
@@ -5256,20 +5256,15 @@ regulator_register(const struct regulator_desc *regulator_desc,
        else if (regulator_desc->supply_name)
                rdev->supply_name = regulator_desc->supply_name;
 
+       /*
+        * Attempt to resolve the regulator supply, if specified,
+        * but don't return an error if we fail because we will try
+        * to resolve it again later as more regulators are added.
+        */
+       if (regulator_resolve_supply(rdev))
+               rdev_dbg(rdev, "unable to resolve supply\n");
+
        ret = set_machine_constraints(rdev, constraints);
-       if (ret == -EPROBE_DEFER) {
-               /* Regulator might be in bypass mode and so needs its supply
-                * to set the constraints */
-               /* FIXME: this currently triggers a chicken-and-egg problem
-                * when creating -SUPPLY symlink in sysfs to a regulator
-                * that is just being created */
-               ret = regulator_resolve_supply(rdev);
-               if (!ret)
-                       ret = set_machine_constraints(rdev, constraints);
-               else
-                       rdev_dbg(rdev, "unable to resolve supply early: %pe\n",
-                                ERR_PTR(ret));
-       }
        if (ret < 0)
                goto wash;