2014-02-21 06:42:47

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the akpm-current tree with the sparc tree

Hi Andrew,

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 fixed it up (I used the version from the sparc tree) and can carry the
fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell [email protected]

Attachments:
(No filename) (533.00 B)
 (No filename) (836.00 B)
 Download all attachments

2014-02-21 11:32:52

by David Howells

[permalink] [raw]
Subject: Re: linux-next: manual merge of the akpm-current tree with the sparc tree

Stephen Rothwell <[email protected]> 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.

David

2014-02-21 17:20:05

by David Miller

[permalink] [raw]
Subject: Re: linux-next: manual merge of the akpm-current tree with the sparc tree

From: David Howells <[email protected]>
Date: Fri, 21 Feb 2014 11:32:44 +0000

> Stephen Rothwell <[email protected]> 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.