* linux-next: manual merge of the regulator tree with the qcom tree
@ 2015-12-17 2:01 Stephen Rothwell
2015-12-17 11:22 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2015-12-17 2:01 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Andy Gross
Hi all,
Today's linux-next merge of the regulator tree got a conflict in:
Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the regulator tree with the qcom tree
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
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2015-12-17 11:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Andy Gross
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the regulator tree with the qcom tree
2015-12-17 11:22 ` Mark Brown
@ 2015-12-17 17:58 ` Andy Gross
2015-12-17 18:03 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Andy Gross @ 2015-12-17 17:58 UTC (permalink / raw)
To: Mark Brown
Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel,
Andy Gross
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.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the regulator tree with the qcom tree
2015-12-17 17:58 ` Andy Gross
@ 2015-12-17 18:03 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2015-12-17 18:03 UTC (permalink / raw)
To: Andy Gross
Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel,
Andy Gross
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
On Thu, Dec 17, 2015 at 11:58:22AM -0600, Andy Gross wrote:
> On Thu, Dec 17, 2015 at 11:22:01AM +0000, Mark Brown wrote:
> > > 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.
OK, great - thanks.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-17 18:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2015-12-17 18:03 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox