Hi Chris, This conflict has been caused in part because you rebased your tree and copied some commits that used to be merged into your tree from a shared branch. Do *not* do that ... BTW, when you rebased those commits into your tree, you did not sign them either. This is exactly what Linus has just berated one of the other maintainers for ... I am not fixing this conflict, I am just using the version of your tree that I have from next-20120326. Please fix your tree up properly. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpDIMnPJQ6ZJ.pgp
Description: PGP signature
