From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 2 Apr 2024 16:29:51 +0000 (-0400)
Subject: Merge tag 'kvm-riscv-fixes-6.9-1' of https://github.com/kvm-riscv/linux into HEAD
X-Git-Tag: v6.9-rc3~33^2
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fkernel%2Fstable.git;a=commitdiff_plain;h=9bc60f733839ab6fcdde0d0b15cbb486123e6402

Merge tag 'kvm-riscv-fixes-6.9-1' of https://github.com/kvm-riscv/linux into HEAD

KVM/riscv fixes for 6.9, take #1

- Fix spelling mistake in arch_timer selftest
- Remove redundant semicolon in num_isa_ext_regs()
- Fix APLIC setipnum_le/be write emulation
- Fix APLIC in_clrip[x] read emulation
---

9bc60f733839ab6fcdde0d0b15cbb486123e6402
diff --cc tools/testing/selftests/kvm/aarch64/arch_timer.c
index 93100b3f1312,16ac74d07d68..4eaba83cdcf3
--- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
+++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
@@@ -135,8 -135,8 +135,8 @@@ static void guest_run_stage(struct test
  
  		irq_iter = READ_ONCE(shared_data->nr_iter);
  		__GUEST_ASSERT(config_iter + 1 == irq_iter,
 -				"config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
 +				"config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
- 				"  Guest timer interrupt was not trigged within the specified\n"
+ 				"  Guest timer interrupt was not triggered within the specified\n"
  				"  interval, try to increase the error margin by [-e] option.\n",
  				config_iter + 1, irq_iter);
  	}