linux-next: manual merge of the arm-soc tree with the arm tree

From: Stephen Rothwell
Date: Sat Jul 16 2011 - 08:37:24 EST

Hi Arnd,

Today's linux-next merge of the arm-soc tree got conflicts in lots of
files due to commit 7712eeac230b ("arm-soc: remove rmk/for-next merge")
from the arm-soc tree (and maybe some others).

Arnd, is there some way that you can rebuild (rebase) your tree without
the merge of Russell's tree and the consequent revert of that merge? It
is likely to revert a whole swath of changes from Russell's tree :-(

I have dropped the arm-soc tree for today.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature