From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754935AbdD0D3c (ORCPT ); Wed, 26 Apr 2017 23:29:32 -0400 Received: from ozlabs.org ([103.22.144.67]:43495 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751210AbdD0D3Z (ORCPT ); Wed, 26 Apr 2017 23:29:25 -0400 Date: Thu, 27 Apr 2017 13:29:17 +1000 From: Stephen Rothwell To: Christian Borntraeger , Cornelia Huck , Martin Schwidefsky , Heiko Carstens Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Harald Freudenberger , "Jason J. Herne" Subject: linux-next: manual merge of the kvms390 tree with the s390 tree Message-ID: <20170427132917.3843cedc@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -- Cheers, Stephen Rothwell diff --cc arch/s390/include/asm/cpacf.h index 7707a35176c4,31cac7d17b48..000000000000 --- a/arch/s390/include/asm/cpacf.h +++ b/arch/s390/include/asm/cpacf.h @@@ -25,7 -25,8 +25,8 @@@ #define CPACF_KMO 0xb92b /* MSA4 */ #define CPACF_PCC 0xb92c /* MSA4 */ #define CPACF_KMCTR 0xb92d /* MSA4 */ -#define CPACF_PPNO 0xb93c /* MSA5 */ +#define CPACF_PRNO 0xb93c /* MSA5 */ + #define CPACF_KMA 0xb929 /* MSA8 */ /* * En/decryption modifier bits