lkml.org 
[lkml]   [2013]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: please cleanup the cpuidle tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-11 02:21    [W:0.083 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site