On 01/11/2013 01:56 AM, Stephen Rothwell wrote: > Hi Daniel, > > On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: >> >> On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
