Re: linux-next: manual merge of the akpm-current tree with the sparc tree

[David Miller]

From: David Howells <dhowells@xxxxxxxxxx>
Date: Fri, 21 Feb 2014 11:32:44 +0000

> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
>> Today's linux-next merge of the akpm-current tree got a conflict in
>> drivers/sbus/char/jsflash.c between commit 967f038e491b ("Sparc:
>> sparc_cpu_model isn't in asm/system.h any more [ver #2]") from the sparc
>> tree and commit 695f43eb1721 ("asm/system.h: sparc: sparc_cpu_model isn't
>> in asm/system.h any more") from the akpm-current tree.
> 
> I think Andrew's is an old version.

Right.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/