Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1293556 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-12-17 03:10 +0100 |
| Last post | 2015-12-17 19:10 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the regulator tree with the qcom tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-17 03:10 +0100
Re: linux-next: manual merge of the regulator tree with the qcom tree Mark Brown <broonie@kernel.org> - 2015-12-17 12:30 +0100
Re: linux-next: manual merge of the regulator tree with the qcom tree Andy Gross <andy.gross@linaro.org> - 2015-12-17 19:00 +0100
Re: linux-next: manual merge of the regulator tree with the qcom tree Mark Brown <broonie@kernel.org> - 2015-12-17 19:10 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-12-17 03:10 +0100 |
| Subject | linux-next: manual merge of the regulator tree with the qcom tree |
| Message-ID | <qGwb0-1vx-13@gated-at.bofh.it> |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2015-12-17 12:30 +0100 |
| Message-ID | <qGEUW-79i-7@gated-at.bofh.it> |
| In reply to | #1293556 |
[Multipart message — attachments visible in raw view] — view raw
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?
[toc] | [prev] | [next] | [standalone]
| From | Andy Gross <andy.gross@linaro.org> |
|---|---|
| Date | 2015-12-17 19:00 +0100 |
| Message-ID | <qGL0o-2Bm-47@gated-at.bofh.it> |
| In reply to | #1293788 |
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2015-12-17 19:10 +0100 |
| Message-ID | <qGLa2-2TY-11@gated-at.bofh.it> |
| In reply to | #1294105 |
[Multipart message — attachments visible in raw view] — view raw
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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web