Messages in this thread | | | Date | Fri, 11 Jan 2013 20:19:43 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: please cleanup the cpuidle tree |
| |
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 [unhandled content-type:application/pgp-signature] | |