Hi Daniel,

On Fri, 11 Jan 2013 10:10:12 +0100 Daniel Lezcano <[email protected]> 
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                    [email protected]

Attachment: pgpUOfdwiioxo.pgp
Description: PGP signature

Reply via email to