From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S932755AbdD0Grg (ORCPT <rfc822;w@1wt.eu>);
        Thu, 27 Apr 2017 02:47:36 -0400
Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:44887 "EHLO
        mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL)
        by vger.kernel.org with ESMTP id S1753775AbdD0Gra (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 27 Apr 2017 02:47:30 -0400
Subject: Re: linux-next: manual merge of the kvms390 tree with the s390 tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Cornelia Huck <cornelia.huck@de.ibm.com>,
        Martin Schwidefsky <schwidefsky@de.ibm.com>,
        Heiko Carstens <heiko.carstens@de.ibm.com>
References: <20170427132917.3843cedc@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Harald Freudenberger <freude@linux.vnet.ibm.com>,
        "Jason J. Herne" <jjherne@linux.vnet.ibm.com>
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Thu, 27 Apr 2017 08:47:22 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.8.0
MIME-Version: 1.0
In-Reply-To: <20170427132917.3843cedc@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-TM-AS-GCONF: 00
x-cbid: 17042706-0024-0000-0000-00001650ED0D
X-IBM-SpamModules-Scores: 
X-IBM-SpamModules-Versions: BY=3.00006981; HX=3.00000240; KW=3.00000007;
 PH=3.00000004; SC=3.00000208; SDB=6.00853082; UDB=6.00421747; IPR=6.00631918;
 BA=6.00005313; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000;
 ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015201; XFM=3.00000013;
 UTC=2017-04-27 06:47:27
X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
x-cbparentid: 17042706-0025-0000-0000-00004A95D062
Message-Id: <4dbc5e97-2577-d3b7-466c-24cba3a3fdca@de.ibm.com>
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-04-27_06:,,
 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-1703280000
 definitions=main-1704270113
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 04/27/2017 05:29 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 
>   arch/s390/include/asm/cpacf.h
> 
> between commit:
> 
>   985a9d20daa6 ("s390/crypto: Renaming PPNO to PRNO.")
> 
> from the s390 tree and commit:
> 
>   152c1c8d60eb ("s390/cpacf: Introduce kma instruction")
> 
> from the kvms390 tree.
> 
> I fixed it up (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.
> 

Correct fix, thanks. It should be ok again tomorrow as Martin has merged
my topic branch.