From: Mark Brown <broonie@kernel.org>
To: Doug Anderson <dianders@chromium.org>
Cc: linux-arm-msm <linux-arm-msm@vger.kernel.org>,
Dmitry Osipenko <digetx@gmail.com>,
Evan Green <evgreen@chromium.org>,
masneyb@onstation.org, Liam Girdwood <lgirdwood@gmail.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] regulator: core: Clean enabling always-on regulators + their supplies
Date: Tue, 11 Dec 2018 01:00:32 +0000 [thread overview]
Message-ID: <20181211010032.GE3004@sirena.org.uk> (raw)
In-Reply-To: <20181211005221.GB3004@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 879 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-12-11 1:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-06 22:23 [PATCH] regulator: core: Clean enabling always-on regulators + their supplies Douglas Anderson
2018-12-07 1:31 ` Brian Masney
2018-12-10 15:43 ` Mark Brown
2018-12-10 16:32 ` Doug Anderson
2018-12-11 0:52 ` Mark Brown
2018-12-11 1:00 ` Mark Brown [this message]
2018-12-11 2:40 ` Doug Anderson
2018-12-11 14:06 ` Mark Brown
2018-12-11 16:21 ` Doug Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181211010032.GE3004@sirena.org.uk \
--to=broonie@kernel.org \
--cc=dianders@chromium.org \
--cc=digetx@gmail.com \
--cc=evgreen@chromium.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masneyb@onstation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).