linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree

Path	csiph.com!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
Date	Thu, 20 Apr 2017 05:40:01 +0200
Message-ID	<tyb6N-3Js-7@gated-at.bofh.it> (permalink)
X-Original-To	Paul Mackerras <paulus@ozlabs.org>, Christoffer Dall <cdall@cs.columbia.edu>, Marc Zyngier <marc.zyngier@arm.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1492659406; bh=qre45gPcYv9bZbeHWSGggZ8Xgtj0XOXHJDzQgXGcKEw=; h=Date:From:To:Cc:Subject:From; b=BK1fPXvsi2h+BS06axcTvxzAApQt3MXukjhdRNosi+aylTATziAJ6QuU9wG9+Wefw livmOdXYqf9ce5GoXQRdNYBqlzDd9V+ggccv3mRQTY0ALaVidO/eYSps67ZgNiZK8g oN2Mxasc8verxH//7MUmVp8ZSRFO5xdkrwqNBolxnhi2x/aGDde6O7UQaRw7k3ObYB dGlihsYS1Ya0OVUcy+4N2t/tjehbbD8zYgwvnOrRt3YO4SsSnuimF2nCRv4m8OXunc +D017P3hVVfn+OXsnpJffKICYDC4fpPJz0UuvwMEdVPfCQd2C2mIuAaUdSqTo+WjHh L0rHRmWDwfoqw==
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Alexander Graf <agraf@suse.de>, Alexey Kardashevskiy <aik@ozlabs.ru>
X-Original-Date	Thu, 20 Apr 2017 13:36:46 +1000
X-Original-Message-ID	<20170420133646.17d6794f@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1626956

Show key headers only | View raw

Hi all,

Today's linux-next merge of the kvm-ppc tree got a conflict in:

  include/uapi/linux/kvm.h

between commit:

  3fe17e682616 ("KVM: arm/arm64: Add ARM user space interrupt signaling ABI")

from the kvm-arm tree and commit:

  4898d3f49b5b ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number")

from the kvm-ppc 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 include/uapi/linux/kvm.h
index 5a147763a7df,3c168b6fd74b..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -892,7 -892,7 +892,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_MIPS_64BIT 139
  #define KVM_CAP_S390_GS 140
  #define KVM_CAP_S390_AIS 141
 -#define KVM_CAP_SPAPR_TCE_VFIO 142
 +#define KVM_CAP_ARM_USER_IRQ 142
++#define KVM_CAP_SPAPR_TCE_VFIO 143
  
  #ifdef KVM_CAP_IRQ_ROUTING

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-20 05:40 +0200

csiph-web