Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* 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; 7+ 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] 7+ messages in thread

* Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
  2019-05-01  6:09 Stephen Rothwell
@ 2019-05-01 10:48 ` Dave Martin
  0 siblings, 0 replies; 7+ messages in thread
From: Dave Martin @ 2019-05-01 10:48 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Paul Mackerras, Christoffer Dall, Marc Zyngier,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Amit Daniel Kachhap, Cédric Le Goater

On Wed, May 01, 2019 at 04:09:02PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvm-ppc tree got a conflict in:
> 
>   include/uapi/linux/kvm.h
> 
> between commits:
> 
>   555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support")
>   a243c16d18be ("KVM: arm64: Add capability to advertise ptrauth for guest")
> 
> from the kvm-arm tree and commit:
> 
>   eacc56bb9de3 ("KVM: PPC: Book3S HV: XIVE: Introduce a new capability KVM_CAP_PPC_IRQ_XIVE")
> 
> 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 4dc34f8e29f6,52bf74a1616e..000000000000
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@@ -988,9 -988,7 +988,10 @@@ struct kvm_ppc_resize_hpt 
>   #define KVM_CAP_ARM_VM_IPA_SIZE 165
>   #define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166
>   #define KVM_CAP_HYPERV_CPUID 167
>  -#define KVM_CAP_PPC_IRQ_XIVE 168
>  +#define KVM_CAP_ARM_SVE 168
>  +#define KVM_CAP_ARM_PTRAUTH_ADDRESS 169
>  +#define KVM_CAP_ARM_PTRAUTH_GENERIC 170
> ++#define KVM_CAP_PPC_IRQ_XIVE 171

Looks good to me.

Cheers
---Dave

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
@ 2019-05-01  6:09 Stephen Rothwell
  2019-05-01 10:48 ` Dave Martin
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2019-05-01  6:09 UTC (permalink / raw)
  To: Paul Mackerras, Christoffer Dall, Marc Zyngier
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Dave Martin,
	Amit Daniel Kachhap, Cédric Le Goater

[-- Attachment #1: Type: text/plain, Size: 1408 bytes --]

Hi all,

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

  include/uapi/linux/kvm.h

between commits:

  555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support")
  a243c16d18be ("KVM: arm64: Add capability to advertise ptrauth for guest")

from the kvm-arm tree and commit:

  eacc56bb9de3 ("KVM: PPC: Book3S HV: XIVE: Introduce a new capability KVM_CAP_PPC_IRQ_XIVE")

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 4dc34f8e29f6,52bf74a1616e..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -988,9 -988,7 +988,10 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_ARM_VM_IPA_SIZE 165
  #define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166
  #define KVM_CAP_HYPERV_CPUID 167
 -#define KVM_CAP_PPC_IRQ_XIVE 168
 +#define KVM_CAP_ARM_SVE 168
 +#define KVM_CAP_ARM_PTRAUTH_ADDRESS 169
 +#define KVM_CAP_ARM_PTRAUTH_GENERIC 170
++#define KVM_CAP_PPC_IRQ_XIVE 171
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ 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; 7+ 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] 7+ messages in thread

* Re: 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
  2018-10-11  8:58   ` Paolo Bonzini
  0 siblings, 1 reply; 7+ 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] 7+ messages in thread

* 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; 7+ 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] 7+ messages in thread

* linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
@ 2017-04-20  3:36 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2017-04-20  3:36 UTC (permalink / raw)
  To: Paul Mackerras, Christoffer Dall, Marc Zyngier
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Alexander Graf, Alexey Kardashevskiy

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
  

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-25  1:54 linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-05-01  6:09 Stephen Rothwell
2019-05-01 10:48 ` Dave Martin
2018-10-10  2:22 Stephen Rothwell
2018-10-11  2:06 ` Stephen Rothwell
2018-10-11  8:58   ` Paolo Bonzini
2017-04-20  3:36 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git