From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Babu Moger <babu.moger@oracle.com>,
Pavel Tatashin <pasha.tatashin@oracle.com>
Subject: linux-next: manual merge of the akpm-current tree with the sparc tree
Date: Wed, 29 Mar 2017 16:37:46 +1100 [thread overview]
Message-ID: <20170329163746.5f4df976@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-03-29 5:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 5:37 Stephen Rothwell [this message]
2017-03-29 5:43 ` linux-next: manual merge of the akpm-current tree with the sparc tree David Miller
2017-04-11 17:27 ` Pasha Tatashin
2017-04-11 17:39 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-02-21 6:42 Stephen Rothwell
2014-02-21 11:32 ` David Howells
2014-02-21 17:19 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170329163746.5f4df976@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=babu.moger@oracle.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pasha.tatashin@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox