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

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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/sparc/lib/NG4memset.S

between commit:

  0ae2d26ffe70 ("arch/sparc: Avoid DCTI Couples")

from the sparc tree and commit:

  3f506bf2a354 ("sparc64: NG4 memset 32 bits overflow")

from the akpm-current tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/sparc/lib/NG4memset.S
index 7c0c81f18837,e7c2e70df263..000000000000
--- a/arch/sparc/lib/NG4memset.S
+++ b/arch/sparc/lib/NG4memset.S
@@@ -99,8 -99,7 +99,8 @@@ NG4bzero
  	stxa		%o4, [%o0 + %g2] ASI_BLK_INIT_QUAD_LDD_P
  	stxa		%o4, [%o0 + %g3] ASI_BLK_INIT_QUAD_LDD_P
  	stxa		%o4, [%o0 + %o5] ASI_BLK_INIT_QUAD_LDD_P
- 	bne,pt		%icc, 1b
+ 	bne,pt		%xcc, 1b
  	 add		%o0, 0x30, %o0
- 	ba,a,pt		%icc, .Lpostloop
+ 	ba,a,pt		%xcc, .Lpostloop
 +	 nop
  	.size		NG4bzero,.-NG4bzero

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 29 Mar 2017 16:37:46 +1100

>   3f506bf2a354 ("sparc64: NG4 memset 32 bits overflow")

Andrew, this change still needs discussion and review and I intended
to push it via my tree once everything was sorted out.

Thank you.

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

[Pasha Tatashin]

Hi David and Andrew,

Should I send this change to sparc ml for discussion?

Thank you,
Pasha

On 03/29/2017 01:43 AM, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 29 Mar 2017 16:37:46 +1100
> 
>>    3f506bf2a354 ("sparc64: NG4 memset 32 bits overflow")
> 
> Andrew, this change still needs discussion and review and I intended
> to push it via my tree once everything was sorted out.
> 
> Thank you.
> 
> 

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

[David Miller]

From: Pasha Tatashin <pasha.tatashin@oracle.com>
Date: Tue, 11 Apr 2017 13:27:38 -0400

> Should I send this change to sparc ml for discussion?

It's in the review pile on patchwork, there is nothing more for
you to do other than to be patient.

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

[David Miller]

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

> Stephen Rothwell <sfr@canb.auug.org.au> 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.

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

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> 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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

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                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]