From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751668AbdF1GCP (ORCPT ); Wed, 28 Jun 2017 02:02:15 -0400 Received: from ozlabs.org ([103.22.144.67]:43601 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751010AbdF1GCG (ORCPT ); Wed, 28 Jun 2017 02:02:06 -0400 Date: Wed, 28 Jun 2017 16:02:04 +1000 From: Stephen Rothwell To: Christian Borntraeger , Cornelia Huck , Christoffer Dall , Marc Zyngier Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Andrew Jones , Claudio Imbrenda , Marcelo Tosatti , Gleb Natapov , KVM Subject: Re: linux-next: manual merge of the kvms390 tree with the kvm-arm tree Message-ID: <20170628160204.0007fe06@canb.auug.org.au> In-Reply-To: <20170609142856.461a9d28@canb.auug.org.au> References: <20170609142856.461a9d28@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, On Fri, 9 Jun 2017 14:28:56 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/include/asm/kvm_host.h > > between commit: > > 2387149eade2 ("KVM: improve arch vcpu request defining") > > from the kvm-arm tree and commit: > > 8611a6a64661 ("KVM: s390: CMMA tracking, ESSA emulation, migration mode") > > 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/kvm_host.h > index 9c3bd94204ac,a8cafed79eb4..000000000000 > --- a/arch/s390/include/asm/kvm_host.h > +++ b/arch/s390/include/asm/kvm_host.h > @@@ -42,9 -42,11 +42,11 @@@ > #define KVM_HALT_POLL_NS_DEFAULT 80000 > > /* s390-specific vcpu->requests bit members */ > -#define KVM_REQ_ENABLE_IBS 8 > -#define KVM_REQ_DISABLE_IBS 9 > -#define KVM_REQ_ICPT_OPEREXC 10 > -#define KVM_REQ_START_MIGRATION 11 > -#define KVM_REQ_STOP_MIGRATION 12 > +#define KVM_REQ_ENABLE_IBS KVM_ARCH_REQ(0) > +#define KVM_REQ_DISABLE_IBS KVM_ARCH_REQ(1) > +#define KVM_REQ_ICPT_OPEREXC KVM_ARCH_REQ(2) > ++#define KVM_REQ_START_MIGRATION KVM_ARCH_REQ(3) > ++#define KVM_REQ_STOP_MIGRATION KVM_ARCH_REQ(4) > > #define SIGP_CTRL_C 0x80 > #define SIGP_CTRL_SCN_MASK 0x3f With the merge window appraoching, I assume that these 2 trees will merge in the kvm tree soon. This is just a reminder that this conflict still exists (I think). -- Cheers, Stephen Rothwell