* Is next/cleanup of arm-soc tree stable?
@ 2013-10-14 16:13 Shawn Guo
2013-10-14 17:27 ` Kevin Hilman
0 siblings, 1 reply; 4+ messages in thread
From: Shawn Guo @ 2013-10-14 16:13 UTC (permalink / raw)
To: linux-arm-kernel
Olof, Kevin,
Per reports from linux-next folks, it seems that my imx/soc branch
conflicts with Sebastian's clk-of-init-v2_for-3.13 quite badly. I'm
considering to rebase my imx/soc branch on arm-soc next/cleanup branch
to solve the conflicts. But is the branch stable, or do I have to base
on Sebastian's clk-of-init-v2_for-3.13 branch (assume it's stable)?
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
* Is next/cleanup of arm-soc tree stable?
2013-10-14 16:13 Is next/cleanup of arm-soc tree stable? Shawn Guo
@ 2013-10-14 17:27 ` Kevin Hilman
2013-10-14 18:28 ` Sebastian Hesselbarth
0 siblings, 1 reply; 4+ messages in thread
From: Kevin Hilman @ 2013-10-14 17:27 UTC (permalink / raw)
To: linux-arm-kernel
Shawn Guo <shawn.guo@linaro.org> writes:
> Olof, Kevin,
>
> Per reports from linux-next folks, it seems that my imx/soc branch
> conflicts with Sebastian's clk-of-init-v2_for-3.13 quite badly. I'm
> considering to rebase my imx/soc branch on arm-soc next/cleanup branch
> to solve the conflicts. But is the branch stable, or do I have to base
> on Sebastian's clk-of-init-v2_for-3.13 branch (assume it's stable)?
Generally, the next/* branches are not stable.
It would be better if you could get a commitment from Sebastian for a
immutable branch and base directly on that.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Is next/cleanup of arm-soc tree stable?
2013-10-14 17:27 ` Kevin Hilman
@ 2013-10-14 18:28 ` Sebastian Hesselbarth
2013-10-15 14:01 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-14 18:28 UTC (permalink / raw)
To: linux-arm-kernel
On 10/14/2013 07:27 PM, Kevin Hilman wrote:
> Shawn Guo <shawn.guo@linaro.org> writes:
>
>> Olof, Kevin,
>>
>> Per reports from linux-next folks, it seems that my imx/soc branch
>> conflicts with Sebastian's clk-of-init-v2_for-3.13 quite badly. I'm
>> considering to rebase my imx/soc branch on arm-soc next/cleanup branch
>> to solve the conflicts. But is the branch stable, or do I have to base
>> on Sebastian's clk-of-init-v2_for-3.13 branch (assume it's stable)?
>
> Generally, the next/* branches are not stable.
>
> It would be better if you could get a commitment from Sebastian for a
> immutable branch and base directly on that.
Shawn,
I sent a PR for the above a while ago [1]. I am not going to touch this
branch at all. Compared to what will go into -next, the was a section
mismatch fixup patch for nomadik requested by Olof.
If you or Kevin want me to prepare (different) rebased branch, I can
do that. Otherwise, I suggest to just pull the existing branch as a
dependency.
Sebastian
[1] http://www.spinics.net/lists/arm-kernel/msg276175.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Is next/cleanup of arm-soc tree stable?
2013-10-14 18:28 ` Sebastian Hesselbarth
@ 2013-10-15 14:01 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2013-10-15 14:01 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 14, 2013 at 08:28:29PM +0200, Sebastian Hesselbarth wrote:
> On 10/14/2013 07:27 PM, Kevin Hilman wrote:
> >Shawn Guo <shawn.guo@linaro.org> writes:
> >
> >>Olof, Kevin,
> >>
> >>Per reports from linux-next folks, it seems that my imx/soc branch
> >>conflicts with Sebastian's clk-of-init-v2_for-3.13 quite badly. I'm
> >>considering to rebase my imx/soc branch on arm-soc next/cleanup branch
> >>to solve the conflicts. But is the branch stable, or do I have to base
> >>on Sebastian's clk-of-init-v2_for-3.13 branch (assume it's stable)?
> >
> >Generally, the next/* branches are not stable.
> >
> >It would be better if you could get a commitment from Sebastian for a
> >immutable branch and base directly on that.
>
> Shawn,
>
> I sent a PR for the above a while ago [1]. I am not going to touch this
> branch at all. Compared to what will go into -next, the was a section
> mismatch fixup patch for nomadik requested by Olof.
>
> If you or Kevin want me to prepare (different) rebased branch, I can
> do that. Otherwise, I suggest to just pull the existing branch as a
> dependency.
Ok, will do so. Thanks, Sebastian.
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-15 14:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-14 16:13 Is next/cleanup of arm-soc tree stable? Shawn Guo
2013-10-14 17:27 ` Kevin Hilman
2013-10-14 18:28 ` Sebastian Hesselbarth
2013-10-15 14:01 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox