[GIT,PULL] KVM/arm64 updates for 6.7

Commit Message

Oliver Upton Oct. 31, 2023, 6:48 p.m. UTC

Hi Paolo,

Here's the pile of KVM/arm64 changes for 6.7.

Almost all of these changes have been baking in -next for a while, although
I did need to rebase to back out a broken change last minute.

I'm only aware of a single (trivial) conflict with the arm64 tree resulting
from a moved cpucap check, resolution below.

Please pull.

Comments

Paolo Bonzini Oct. 31, 2023, 9:18 p.m. UTC | #1

On 10/31/23 19:48, Oliver Upton wrote:
> Hi Paolo, Here's the pile of KVM/arm64 changes for 6.7. Almost all of 
> these changes have been baking in -next for a while, although I did need 
> to rebase to back out a broken change last minute. I'm only aware of a 
> single (trivial) conflict with the arm64 tree resulting from a moved 
> cpucap check, resolution below. Please pull.

Pulled, thanks.

Paolo

Patch

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 49ce32d3d6f7..e5f75f1f1085 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1298,12 +1298,6 @@  static int kvm_vcpu_init_check_features(struct kvm_vcpu *vcpu,
 	if (!test_bit(KVM_ARM_VCPU_EL1_32BIT, &features))
 		return 0;
 
-<<<<<<< HEAD
-=======
-	if (!cpus_have_final_cap(ARM64_HAS_32BIT_EL1))
-		return -EINVAL;
-
->>>>>>> arm64-upstream
 	/* MTE is incompatible with AArch32 */
 	if (kvm_has_mte(vcpu->kvm))
 		return -EINVAL;