Re: linux-next: manual merge of the arm tree with the arm-currenttree

From: Stephen Rothwell
Date: Sun Jan 17 2010 - 22:34:43 EST

Hi Ben,

On Mon, 18 Jan 2010 01:33:07 +0000 Ben Dooks <ben-linux@xxxxxxxxx> wrote:
> Is that from the merge of next-samsung or from two parts of the ARM
> trees?

I merged the arm-current tree
(ssh:// into
linux-next and then later the arm tree
(ssh:// and the second
merge produced this conflict. However, Russell has merged the samsung
tree (git:// into the arm
tree, already.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature