From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mackerras <paulus@ozlabs•org>,
Christoffer Dall <cdall@cs•columbia.edu>,
Marc Zyngier <marc.zyngier@arm•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alexey Kardashevskiy <aik@ozlabs•ru>,
Shannon Zhao <shannon.zhao@linaro•org>
Subject: linux-next: manual merge of the kvm-ppc-paulus tree with the kvm-arm tree
Date: Wed, 2 Mar 2016 13:47:14 +1100 [thread overview]
Message-ID: <20160302134714.2629ee08@canb.auug.org.au> (raw)
Hi Paul,
Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
808e738142e7 ("arm64: KVM: Add a new feature bit for PMUv3")
f577f6c2a6a5 ("arm64: KVM: Introduce per-vcpu kvm device controls")
from the kvm-arm tree and commit:
01d01d69192e ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_64 capability number")
from the kvm-ppc-paulus tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc include/uapi/linux/kvm.h
index ba098d8ae5fc,b06208b2669c..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -862,8 -850,7 +862,9 @@@ struct kvm_ppc_smmu_info
#define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
#define KVM_CAP_HYPERV_SYNIC 123
#define KVM_CAP_S390_RI 124
-#define KVM_CAP_SPAPR_TCE_64 125
+#define KVM_CAP_ARM_PMU_V3 125
+#define KVM_CAP_VCPU_ATTRIBUTES 126
++#define KVM_CAP_SPAPR_TCE_64 127
#ifdef KVM_CAP_IRQ_ROUTING
reply other threads:[~2016-03-02 2:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160302134714.2629ee08@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aik@ozlabs$(echo .)ru \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
--cc=paulus@ozlabs$(echo .)org \
--cc=shannon.zhao@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox