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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20181211010032.GE3004@sirena.org.uk>
Date:   Tue, 11 Dec 2018 01:00:32 +0000
From:   Mark Brown <broonie@...nel.org>
To:     Doug Anderson <dianders@...omium.org>
Cc:     linux-arm-msm <linux-arm-msm@...r.kernel.org>,
        Dmitry Osipenko <digetx@...il.com>,
        Evan Green <evgreen@...omium.org>, masneyb@...tation.org,
        Liam Girdwood <lgirdwood@...il.com>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] regulator: core: Clean enabling always-on regulators +
 their supplies

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

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)