From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alexander Graf <agraf@suse•de>,
Christoffer Dall <cdall@cs•columbia.edu>,
Marc Zyngier <marc.zyngier@arm•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Anup Patel <anup.patel@linaro•org>
Subject: linux-next: manual merge of the kvm-ppc tree with the tree
Date: Mon, 2 Jun 2014 16:34:29 +1000 [thread overview]
Message-ID: <20140602163429.357cf678@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
include/uapi/linux/kvm.h between commit 717abd208dff ("KVM: Add
capability to advertise PSCI v0.2 support") from the kvm-arm tree and
commit f2e91042a807 ("KVM: PPC: Add CAP to indicate hcall fixes") from
the kvm-ppc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/uapi/linux/kvm.h
index 32cf446f1911,16c923de85e7..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -756,7 -748,7 +756,8 @@@ struct kvm_ppc_smmu_info
#define KVM_CAP_S390_IRQCHIP 99
#define KVM_CAP_IOEVENTFD_NO_LENGTH 100
#define KVM_CAP_VM_ATTRIBUTES 101
-#define KVM_CAP_PPC_FIXUP_HCALL 102
+#define KVM_CAP_ARM_PSCI_0_2 102
++#define KVM_CAP_PPC_FIXUP_HCALL 103
#ifdef KVM_CAP_IRQ_ROUTING
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-06-02 6:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 6:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-11-01 6:05 linux-next: manual merge of the kvm-ppc tree with the tree Stephen Rothwell
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=20140602163429.357cf678@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agraf@suse$(echo .)de \
--cc=anup.patel@linaro$(echo .)org \
--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 \
/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