lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Mar 2017 16:37:46 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Andrew Morton <akpm@...ux-foundation.org>, David Miller <davem@...emloft.net> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Babu Moger <babu.moger@...cle.com>, Pavel Tatashin <pasha.tatashin@...cle.com> 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: 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
Powered by blists - more mailing lists