* linux-next: manual merge of the kvm-ppc tree with the tree
@ 2013-11-01 6:05 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2013-11-01 6:05 UTC (permalink / raw)
To: Alexander Graf, Benjamin Herrenschmidt, linuxppc-dev
Cc: Scott Wood, linux-next, linux-kernel, Bharat Bhushan
[-- Attachment #1.1: Type: text/plain, Size: 498 bytes --]
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/include/asm/processor.h between commit 51ae8d4a2b9e
("powerpc: move debug registers in a structure") from the powerpc tree
and commit 95791988fec6 ("powerpc: move debug registers in a structure")
from the kvm-ppc tree.
Different version of the same patch. I used the powerpc tree version
(there wer other changes there).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists•ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the kvm-ppc tree with the tree
@ 2014-06-02 6:34 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-06-02 6:34 UTC (permalink / raw)
To: Alexander Graf, Christoffer Dall, Marc Zyngier
Cc: linux-next, linux-kernel, Anup Patel
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-02 6:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-02 6:34 linux-next: manual merge of the kvm-ppc tree with the tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-11-01 6:05 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox