* linux-next: please cleanup the cpuidle tree
@ 2013-01-07 22:27 Stephen Rothwell
2013-01-07 23:11 ` Daniel Lezcano
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-01-07 22:27 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 567 bytes --]
Hi Daniel,
All the commits in the cpuidle tree have been included upstream before
v3.6-rc1. They were rewritten before being merged upstream and so are
now causing merge conflicts in linux-next. Could you please reset the
head of your tree
(git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
be somewhere in the tree that yours is merged into (pm or Linus').
Alternatively, if you are not using it any more, let me know and I will
remove it from linux-next.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: please cleanup the cpuidle tree
2013-01-07 22:27 linux-next: please cleanup the cpuidle tree Stephen Rothwell
@ 2013-01-07 23:11 ` Daniel Lezcano
2013-01-07 23:22 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Lezcano @ 2013-01-07 23:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On 01/07/2013 11:27 PM, Stephen Rothwell wrote:
> Hi Daniel,
>
> All the commits in the cpuidle tree have been included upstream before
> v3.6-rc1. They were rewritten before being merged upstream and so are
> now causing merge conflicts in linux-next. Could you please reset the
> head of your tree
> (git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
> be somewhere in the tree that yours is merged into (pm or Linus').
Sure. I believe it is done now.
> Alternatively, if you are not using it any more, let me know and I will
> remove it from linux-next.
I am planning to do some more cleanup in a very near future. So I prefer
to keep it untouched for now.
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: please cleanup the cpuidle tree
2013-01-07 23:11 ` Daniel Lezcano
@ 2013-01-07 23:22 ` Stephen Rothwell
2013-01-11 0:56 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-01-07 23:22 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 928 bytes --]
Hi Daniel,
On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano <daniel.lezcano@linaro•org> wrote:
>
> On 01/07/2013 11:27 PM, Stephen Rothwell wrote:
> >
> > All the commits in the cpuidle tree have been included upstream before
> > v3.6-rc1. They were rewritten before being merged upstream and so are
> > now causing merge conflicts in linux-next. Could you please reset the
> > head of your tree
> > (git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
> > be somewhere in the tree that yours is merged into (pm or Linus').
>
> Sure. I believe it is done now.
Yep, thanks.
> > Alternatively, if you are not using it any more, let me know and I will
> > remove it from linux-next.
>
> I am planning to do some more cleanup in a very near future. So I prefer
> to keep it untouched for now.
No worries.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: please cleanup the cpuidle tree
2013-01-07 23:22 ` Stephen Rothwell
@ 2013-01-11 0:56 ` Stephen Rothwell
2013-01-11 9:10 ` Daniel Lezcano
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-01-11 0:56 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: linux-next, linux-kernel, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
Hi Daniel,
On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano <daniel.lezcano@linaro•org> wrote:
> >
> > On 01/07/2013 11:27 PM, Stephen Rothwell wrote:
> > >
> > > All the commits in the cpuidle tree have been included upstream before
> > > v3.6-rc1. They were rewritten before being merged upstream and so are
> > > now causing merge conflicts in linux-next. Could you please reset the
> > > head of your tree
> > > (git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
> > > be somewhere in the tree that yours is merged into (pm or Linus').
> >
> > Sure. I believe it is done now.
>
> Yep, thanks.
Unfortunately, you reset your tree to be a version of the pm tree that has
now been rebased :-( This is now causing more conflicts in linux-next.
Maybe you should reset your tree to be the same as one of Linus' -rc
releases for now.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: please cleanup the cpuidle tree
2013-01-11 0:56 ` Stephen Rothwell
@ 2013-01-11 9:10 ` Daniel Lezcano
2013-01-11 9:19 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Lezcano @ 2013-01-11 9:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Rafael J. Wysocki
On 01/11/2013 01:56 AM, Stephen Rothwell wrote:
> Hi Daniel,
>
> On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>
>> On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano <daniel.lezcano@linaro•org> wrote:
>>>
>>> On 01/07/2013 11:27 PM, Stephen Rothwell wrote:
>>>>
>>>> All the commits in the cpuidle tree have been included upstream before
>>>> v3.6-rc1. They were rewritten before being merged upstream and so are
>>>> now causing merge conflicts in linux-next. Could you please reset the
>>>> head of your tree
>>>> (git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
>>>> be somewhere in the tree that yours is merged into (pm or Linus').
>>>
>>> Sure. I believe it is done now.
>>
>> Yep, thanks.
>
> Unfortunately, you reset your tree to be a version of the pm tree that has
> now been rebased :-( This is now causing more conflicts in linux-next.
> Maybe you should reset your tree to be the same as one of Linus' -rc
> releases for now.
Ok, done.
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: please cleanup the cpuidle tree
2013-01-11 9:10 ` Daniel Lezcano
@ 2013-01-11 9:19 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2013-01-11 9:19 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: linux-next, linux-kernel, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi Daniel,
On Fri, 11 Jan 2013 10:10:12 +0100 Daniel Lezcano <daniel.lezcano@linaro•org> wrote:
>
> On 01/11/2013 01:56 AM, Stephen Rothwell wrote:
> >
> > Unfortunately, you reset your tree to be a version of the pm tree that has
> > now been rebased :-( This is now causing more conflicts in linux-next.
> > Maybe you should reset your tree to be the same as one of Linus' -rc
> > releases for now.
>
> Ok, done.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-11 9:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-07 22:27 linux-next: please cleanup the cpuidle tree Stephen Rothwell
2013-01-07 23:11 ` Daniel Lezcano
2013-01-07 23:22 ` Stephen Rothwell
2013-01-11 0:56 ` Stephen Rothwell
2013-01-11 9:10 ` Daniel Lezcano
2013-01-11 9:19 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox