From patchwork Wed Jun 29 04:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9204289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A088F60757 for ; Wed, 29 Jun 2016 04:45:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90ABD28644 for ; Wed, 29 Jun 2016 04:45:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81B9328647; Wed, 29 Jun 2016 04:45:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EA3128644 for ; Wed, 29 Jun 2016 04:45:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752692AbcF2Eoj (ORCPT ); Wed, 29 Jun 2016 00:44:39 -0400 Received: from ozlabs.org ([103.22.144.67]:52591 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbcF2Eoh (ORCPT ); Wed, 29 Jun 2016 00:44:37 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3rfVJB2zm9z9s5M; Wed, 29 Jun 2016 14:36:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1467175018; bh=BiFBgJbdK5IfEeWoQHRi7HzoLMEzKxw3R1e6uLYlceM=; h=Date:From:To:Cc:Subject:From; b=tvs16FY76AxCTDn0uYEQ5Vq6JDW0I6aZSL7bkcQwjUhebi/ZwgoveSpTKIi9WsXSb WJt+Eptuod484GWWx8VREJKQt/74wiPD+Ofu/nkj36KS/337enMFIA4XL3HMLeqiT/ 6CtDFS6nmADw6KVazhDs/ilSZIBoHjsv35lIJEws= Date: Wed, 29 Jun 2016 14:36:58 +1000 From: Stephen Rothwell To: Marcelo Tosatti , Gleb Natapov , , Martin Schwidefsky , Heiko Carstens Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Janosch Frank , Christian Borntraeger Subject: linux-next: manual merge of the kvm tree with the s390 tree Message-ID: <20160629143658.204b8d07@canb.auug.org.au> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/s390/hypfs/hypfs_diag.c between commit: e030c1125eab ("s390/hypfs: use basic block for diag inline assembly") from the s390 tree and commit: e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions") from the kvm tree. I fixed it up (my fixup patch now looks like 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. 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c index a44faf4a0454..a97354c8c667 100644 --- a/arch/s390/kernel/diag.c +++ b/arch/s390/kernel/diag.c @@ -162,25 +162,27 @@ int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode) } EXPORT_SYMBOL(diag14); -static inline int __diag204(unsigned long subcode, unsigned long size, void *addr) +static inline int __diag204(unsigned long *subcode, unsigned long size, void *addr) { - register unsigned long _subcode asm("0") = subcode; + register unsigned long _subcode asm("0") = *subcode; register unsigned long _size asm("1") = size; 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) - return -1; + *subcode = _subcode; return _size; } int diag204(unsigned long subcode, unsigned long size, void *addr) { diag_stat_inc(DIAG_STAT_X204); - return __diag204(subcode, size, addr); + size = __diag204(&subcode, size, addr); + if (subcode) + return -1; + return size; } EXPORT_SYMBOL(diag204);