* linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
@ 2018-10-10 2:22 Stephen Rothwell
2018-10-11 2:06 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2018-10-10 2:22 UTC (permalink / raw)
To: Paul Mackerras, Christoffer Dall, Marc Zyngier
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Paolo Bonzini,
Radim Krčmář, KVM, Suzuki K Poulose
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
Hi Paul,
Today's linux-next merge of the kvm-ppc tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
233a7cb23531 ("kvm: arm64: Allow tuning the physical address size for VM")
from the kvm-arm tree and commit:
aa069a996951 ("KVM: PPC: Book3S HV: Add a VM capability to enable nested virtualization")
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 95aa73ca65dc,7f2ff3a76995..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -962,7 -954,7 +963,8 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_NESTED_STATE 157
#define KVM_CAP_ARM_INJECT_SERROR_ESR 158
#define KVM_CAP_MSR_PLATFORM_INFO 159
-#define KVM_CAP_PPC_NESTED_HV 160
+#define KVM_CAP_ARM_VM_IPA_SIZE 160 /* returns maximum IPA bits for a VM */
++#define KVM_CAP_PPC_NESTED_HV 161
#ifdef KVM_CAP_IRQ_ROUTING
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
2018-10-10 2:22 linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree Stephen Rothwell
@ 2018-10-11 2:06 ` Stephen Rothwell
2018-10-11 8:58 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2018-10-11 2:06 UTC (permalink / raw)
To: Paul Mackerras, Christoffer Dall, Marc Zyngier
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Paolo Bonzini,
Radim Krčmář, KVM, Suzuki K Poulose
[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]
Hi all,
On Wed, 10 Oct 2018 13:22:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kvm-ppc tree got a conflict in:
>
> include/uapi/linux/kvm.h
>
> between commit:
>
> 233a7cb23531 ("kvm: arm64: Allow tuning the physical address size for VM")
>
> from the kvm-arm tree and commit:
>
> aa069a996951 ("KVM: PPC: Book3S HV: Add a VM capability to enable nested virtualization")
>
> 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 95aa73ca65dc,7f2ff3a76995..000000000000
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@@ -962,7 -954,7 +963,8 @@@ struct kvm_ppc_resize_hpt
> #define KVM_CAP_NESTED_STATE 157
> #define KVM_CAP_ARM_INJECT_SERROR_ESR 158
> #define KVM_CAP_MSR_PLATFORM_INFO 159
> -#define KVM_CAP_PPC_NESTED_HV 160
> +#define KVM_CAP_ARM_VM_IPA_SIZE 160 /* returns maximum IPA bits for a VM */
> ++#define KVM_CAP_PPC_NESTED_HV 161
>
> #ifdef KVM_CAP_IRQ_ROUTING
>
This is now a conflict between the kvm tree and the kvm-arm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
2018-10-11 2:06 ` Stephen Rothwell
@ 2018-10-11 8:58 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2018-10-11 8:58 UTC (permalink / raw)
To: Stephen Rothwell, Paul Mackerras, Christoffer Dall, Marc Zyngier
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Radim Krčmář, KVM, Suzuki K Poulose
On 11/10/2018 04:06, Stephen Rothwell wrote:
> Hi all,
>
> On Wed, 10 Oct 2018 13:22:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the kvm-ppc tree got a conflict in:
>>
>> include/uapi/linux/kvm.h
>>
>> between commit:
>>
>> 233a7cb23531 ("kvm: arm64: Allow tuning the physical address size for VM")
>>
>> from the kvm-arm tree and commit:
>>
>> aa069a996951 ("KVM: PPC: Book3S HV: Add a VM capability to enable nested virtualization")
>>
>> 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 95aa73ca65dc,7f2ff3a76995..000000000000
>> --- a/include/uapi/linux/kvm.h
>> +++ b/include/uapi/linux/kvm.h
>> @@@ -962,7 -954,7 +963,8 @@@ struct kvm_ppc_resize_hpt
>> #define KVM_CAP_NESTED_STATE 157
>> #define KVM_CAP_ARM_INJECT_SERROR_ESR 158
>> #define KVM_CAP_MSR_PLATFORM_INFO 159
>> -#define KVM_CAP_PPC_NESTED_HV 160
>> +#define KVM_CAP_ARM_VM_IPA_SIZE 160 /* returns maximum IPA bits for a VM */
>> ++#define KVM_CAP_PPC_NESTED_HV 161
>>
>> #ifdef KVM_CAP_IRQ_ROUTING
>>
>
> This is now a conflict between the kvm tree and the kvm-arm tree.
Indeed, and ARM will be bumped to 161 (whoever comes first to the kvm
tree wins).
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
@ 2019-10-25 1:54 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-10-25 1:54 UTC (permalink / raw)
To: Paul Mackerras, Christoffer Dall, Marc Zyngier
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Fabiano Rosas,
Paolo Bonzini, Radim Krčmář, KVM
[-- Attachment #1: Type: text/plain, Size: 1385 bytes --]
Hi all,
Today's linux-next merge of the kvm-ppc tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
c726200dd106 ("KVM: arm/arm64: Allow reporting non-ISV data aborts to userspace")
da345174ceca ("KVM: arm/arm64: Allow user injection of external data aborts")
from the kvm-arm tree and commit:
1a9167a214f5 ("KVM: PPC: Report single stepping capability")
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 fb47c0fad6a6,ce8cfcc51aec..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1006,8 -1000,7 +1006,9 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_PMU_EVENT_FILTER 173
#define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174
#define KVM_CAP_HYPERV_DIRECT_TLBFLUSH 175
-#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176
+#define KVM_CAP_ARM_NISV_TO_USER 176
+#define KVM_CAP_ARM_INJECT_EXT_DABT 177
++#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 178
#ifdef KVM_CAP_IRQ_ROUTING
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-25 1:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-10 2:22 linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree Stephen Rothwell
2018-10-11 2:06 ` Stephen Rothwell
2018-10-11 8:58 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2019-10-25 1:54 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox