From: Andy Gross <andy.gross@linaro.org>
To: Mark Brown <broonie@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Gross <agross@codeaurora.org>
Subject: Re: linux-next: manual merge of the regulator tree with the qcom tree
Date: Thu, 17 Dec 2015 11:58:22 -0600 [thread overview]
Message-ID: <20151217175822.GA3835@Agamemnon.attlocal.net> (raw)
In-Reply-To: <20151217112201.GR5727@sirena.org.uk>
On Thu, Dec 17, 2015 at 11:22:01AM +0000, Mark Brown wrote:
> On Thu, Dec 17, 2015 at 01:01:29PM +1100, Stephen Rothwell wrote:
>
> > between commit:
>
> > f6251e80956d ("soc: qcom: documentation: Update SMD/RPM Docs")
> > 9ee8373a1552 ("soc: qcom: smd-rpm: Add existing platform support")
>
> > from the qcom tree and commit:
>
> > 7a400585893e ("soc: qcom: documentation: Update SMD/RPM Docs")
>
> > from the regulator tree.
>
> > I fixed it up (I used the qcom tree version - please sort out the
> > mess).
>
> Andy, what's going on here?
I hadn't reformulated my next branch before Stephen pulled again. My
mistake and it was fixed last night, but not in time.
next prev parent reply other threads:[~2015-12-17 17:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 2:01 linux-next: manual merge of the regulator tree with the qcom tree Stephen Rothwell
2015-12-17 11:22 ` Mark Brown
2015-12-17 17:58 ` Andy Gross [this message]
2015-12-17 18:03 ` Mark Brown
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=20151217175822.GA3835@Agamemnon.attlocal.net \
--to=andy.gross@linaro.org \
--cc=agross@codeaurora.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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