linux-next: manual merge of the kvm-riscv tree with the risc-v tree

[Mark Brown]

Hi all,

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

  arch/riscv/kvm/vcpu_vector.c

between commit:

  0c5a9ab5192b8 ("riscv: Standardize extension capitalization")

from the risc-v tree and commit:

  b5060a4aa33d7 ("RISC-V: KVM: fix vcpu vector context handling for kernel-mode vector")

from the kvm-riscv 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 --cc arch/riscv/kvm/vcpu_vector.c
index 3c3183b39ae2a,bf5c94d8786b5..0000000000000
--- a/arch/riscv/kvm/vcpu_vector.c
+++ b/arch/riscv/kvm/vcpu_vector.c
@@@ -56,9 -56,8 +56,8 @@@ void kvm_riscv_vcpu_guest_vector_restor
  					 unsigned long *isa)
  {
  	if ((cntx->sstatus & SR_VS) != SR_VS_OFF) {
 -		if (riscv_isa_extension_available(isa, v))
 +		if (riscv_isa_extension_available(isa, V))
- 			__kvm_riscv_vector_restore(cntx);
- 		kvm_riscv_vcpu_vector_clean(cntx);
+ 			riscv_v_flags_set(riscv_v_flags() | RISCV_V_VCPU_NEED_RESTORE);
  	}
  }

Attachment: signature.asc
Description: PGP signature