On Mon, Dec 10, 2018 at 06:40:53PM -0800, Doug Anderson wrote:

> Can you confirm my patch applies cleanly to your for-next branch?  I
> can see that it doesn't apply to your 4.21 branch but I can't see it
> fail on your for-next branch.

No, I tried both and it didn't work on either.

> The problem is that commit 2bb166636933 ("regulator: core: enable
> power when setting up constraints") touches the same code but isn't in
> the 4.21 branch.  If you pick that to your 4.21 then my patch applies
> cleanly.

> If you'd prefer that I post my patch atop 4.21 I can do that tomorrow.

I'd prefer that you resend like I said :(