Re: [PATCH] regulator: core: Clean enabling always-on regulators + their supplies

[Mark Brown]

On Tue, Dec 11, 2018 at 12:52:21AM +0000, Mark Brown wrote:
> On Mon, Dec 10, 2018 at 08:32:32AM -0800, Doug Anderson wrote:

> > Can you clarify?  See below where it's applying cleanly to "for-next" for me:

> I tried a git am on my for-4.21 and for-next branches and it didn't work
> on either, I didn't investigate beyond that.

Applying: regulator: core: Clean enabling always-on regulators + their supplies
Using index info to reconstruct a base tree...
M	drivers/regulator/core.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/regulator/core.c
CONFLICT (content): Merge conflict in drivers/regulator/core.c
Recorded preimage for 'drivers/regulator/core.c'
error: Failed to merge in the changes.
Patch failed at 0001 regulator: core: Clean enabling always-on regulators + their supplies
hint: Use 'git am --show-current-patch' to see the failed patch

Attachment: signature.asc
Description: PGP signature