linux-next: manual merge of the kvm-arm tree with the kvm-arm-fixes tree

[Mark Brown]

Hi all,

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

  arch/arm64/include/asm/kvm_asm.h

between commits:

  ecb6b43cd2224 ("KVM: arm64: Reject the GICv5 CPU interface hypercalls under pKVM")
  8c6599d4e4893 ("KVM: arm64: Reject the stage-2 flush hypercalls under pKVM")

from the kvm-arm-fixes tree and commit:

  421c18edc7f3a ("Merge branch kvm-arm64/pkvm-tracing-7.4 into kvmarm-master/next")

from the kvm-arm 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.

diff --combined arch/arm64/include/asm/kvm_asm.h
index abda476e023de,7d799cd05dcd0..0000000000000
--- a/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@@ -63,17 -63,6 +63,17 @@@ enum __kvm_host_smccc_func 
  	__KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs,
  	__KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config,
  	__KVM_HOST_SMCCC_FUNC___pkvm_hyp_alloc_selftest,
 +	__KVM_HOST_SMCCC_FUNC___vgic_v5_make_resident,
 +	__KVM_HOST_SMCCC_FUNC___vgic_v5_make_non_resident,
 +	__KVM_HOST_SMCCC_FUNC___vgic_v5_vdpend,
 +	__KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr,
 +	__KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr,
 +	__KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context,
 +	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa,
 +	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa_nsh,
 +	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid,
 +	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_range,
 +	__KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context,
  
  	MARKER(__KVM_HOST_SMCCC_FUNC_MIN_PKVM),
  
@@@ -82,6 -71,12 +82,6 @@@
  	/* Hypercalls that are always available and common to [nh]VHE/pKVM. */
  	__KVM_HOST_SMCCC_FUNC___kvm_adjust_pc,
  	__KVM_HOST_SMCCC_FUNC___kvm_vcpu_run,
 -	__KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context,
 -	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa,
 -	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa_nsh,
 -	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid,
 -	__KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_range,
 -	__KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context,
  	__KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff,
  	__KVM_HOST_SMCCC_FUNC___tracing_load,
  	__KVM_HOST_SMCCC_FUNC___tracing_unload,
@@@ -93,6 -88,11 +93,6 @@@
  	__KVM_HOST_SMCCC_FUNC___tracing_write_event,
  	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs,
  	__KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs,
 -	__KVM_HOST_SMCCC_FUNC___vgic_v5_make_resident,
 -	__KVM_HOST_SMCCC_FUNC___vgic_v5_make_non_resident,
 -	__KVM_HOST_SMCCC_FUNC___vgic_v5_vdpend,
 -	__KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr,
 -	__KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr,
  	__KVM_HOST_SMCCC_FUNC___pkvm_hyp_topup,
  	__KVM_HOST_SMCCC_FUNC___pkvm_hyp_reclaim,
  	__KVM_HOST_SMCCC_FUNC___pkvm_hyp_reclaimable,

Attachment: signature.asc
Description: PGP signature