From: Doug Anderson <dianders@chromium.org>
To: Mark Brown <broonie@kernel.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 08:21:52 -0800 [thread overview]
Message-ID: <CAD=FV=XsOSBipZHg+DotyFPOsbLXDoS_rPyv7KRHA50GszbN0w@mail.gmail.com> (raw)
In-Reply-To: <20181211140609.GD6686@sirena.org.uk>
Hi,
On Tue, Dec 11, 2018 at 6:06 AM Mark Brown <broonie@kernel.org> wrote:
>
> 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.
I'm totally confused because I can't reproduce, but OK.
> > 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 :(
If I can't reproduce the merge conflict that you're seeing I'm worried
that I'll just be sending you the exact same patch I sent before and
it'll have the same problem. That's why I've been so focused on
trying to understand.
In any case it sounds as if sending it up against 4.21 should be fine
and maybe is preferred (since the patch it Fixes is in 4.21), so here
comes v2 against for-4.21. OK, posted at
<https://lkml.kernel.org/r/20181211161720.102888-1-dianders@chromium.org>
-Doug
prev parent reply other threads:[~2018-12-11 16:22 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
2018-12-11 2:40 ` Doug Anderson
2018-12-11 14:06 ` Mark Brown
2018-12-11 16:21 ` Doug Anderson [this message]
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='CAD=FV=XsOSBipZHg+DotyFPOsbLXDoS_rPyv7KRHA50GszbN0w@mail.gmail.com' \
--to=dianders@chromium.org \
--cc=broonie@kernel.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).