Re: linux-next: please cleanup the cpuidle tree

2013-01-11 Thread Stephen Rothwell
Hi Daniel, On Fri, 11 Jan 2013 10:10:12 +0100 Daniel Lezcano 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

Re: linux-next: please cleanup the cpuidle tree

2013-01-11 Thread Daniel Lezcano
On 01/11/2013 01:56 AM, Stephen Rothwell wrote: > Hi Daniel, > > On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell > wrote: >> >> On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano >> wrote: >>> >>> On 01/07/2013 11:27 PM, Stephen Rothwell wrote: All the commits in the cpuidle tree

Re: linux-next: please cleanup the cpuidle tree

2013-01-11 Thread Daniel Lezcano
On 01/11/2013 01:56 AM, Stephen Rothwell wrote: Hi Daniel, On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano daniel.lezc...@linaro.org wrote: On 01/07/2013 11:27 PM, Stephen Rothwell wrote: All the

Re: linux-next: please cleanup the cpuidle tree

2013-01-11 Thread Stephen Rothwell
Hi Daniel, On Fri, 11 Jan 2013 10:10:12 +0100 Daniel Lezcano daniel.lezc...@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

Re: linux-next: please cleanup the cpuidle tree

2013-01-10 Thread Stephen Rothwell
Hi Daniel, On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell wrote: > > On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano > 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

Re: linux-next: please cleanup the cpuidle tree

2013-01-10 Thread Stephen Rothwell
Hi Daniel, On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano daniel.lezc...@linaro.org wrote: On 01/07/2013 11:27 PM, Stephen Rothwell wrote: All the commits in the cpuidle tree have been included

Re: linux-next: please cleanup the cpuidle tree

2013-01-07 Thread Stephen Rothwell
Hi Daniel, On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano 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

Re: linux-next: please cleanup the cpuidle tree

2013-01-07 Thread Daniel Lezcano
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

linux-next: please cleanup the cpuidle tree

2013-01-07 Thread Stephen Rothwell
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

linux-next: please cleanup the cpuidle tree

2013-01-07 Thread Stephen Rothwell
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

Re: linux-next: please cleanup the cpuidle tree

2013-01-07 Thread Daniel Lezcano
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

Re: linux-next: please cleanup the cpuidle tree

2013-01-07 Thread Stephen Rothwell
Hi Daniel, On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano daniel.lezc...@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