From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423833AbcFNExa (ORCPT ); Tue, 14 Jun 2016 00:53:30 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:13329 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932320AbcFNEx2 (ORCPT ); Tue, 14 Jun 2016 00:53:28 -0400 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: heiko.carstens@de.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-next@vger.kernel.org Date: Tue, 14 Jun 2016 06:52:52 +0200 From: Heiko Carstens To: Stephen Rothwell Cc: Christian Borntraeger , Cornelia Huck , Martin Schwidefsky , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Janosch Frank Subject: Re: linux-next: manual merge of the kvms390 tree with the s390 tree References: <20160614145117.54eba7ec@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160614145117.54eba7ec@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16061404-0020-0000-0000-0000020BADCF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16061404-0021-0000-0000-00003C769D48 Message-Id: <20160614045252.GA3754@osiris> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-14_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606140055 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 14, 2016 at 02:51:17PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/hypfs/hypfs_diag.c > > between commit: > > 6c22c9863760 ("s390: avoid extable collisions") > > from the s390 tree and commit: > > e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions") > > from the kvms390 tree. > > I fixed it up (using the kvms390 version and then adding the following > patch) 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. > > From: Stephen Rothwell > Date: Tue, 14 Jun 2016 14:47:33 +1000 > Subject: [PATCH] s390: merge fix up for __diag204 move > > Signed-off-by: Stephen Rothwell > --- > arch/s390/kernel/diag.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c > index a44faf4a0454..2289d6f8bec0 100644 > --- a/arch/s390/kernel/diag.c > +++ b/arch/s390/kernel/diag.c > @@ -169,7 +169,7 @@ static inline int __diag204(unsigned long subcode, unsigned long size, void *add > > asm volatile( > " diag %2,%0,0x204\n" > - "0:\n" > + "0: nopr %%r7\n" > EX_TABLE(0b,0b) > : "+d" (_subcode), "+d" (_size) : "d" (addr) : "memory"); > if (_subcode) The patch looks good. Thank you!