* linux-next: manual merge of the kvm-riscv tree with the kvm-arm tree
@ 2024-03-27 0:29 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-03-27 0:29 UTC (permalink / raw)
To: Anup Patel, Christoffer Dall, Marc Zyngier
Cc: Colin Ian King, Linux Kernel Mailing List,
Linux Next Mailing List, Oliver Upton, Sean Christopherson
[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]
Hi all,
Today's linux-next merge of the kvm-riscv tree got a conflict in:
tools/testing/selftests/kvm/aarch64/arch_timer.c
between commit:
29b0075ed61c ("KVM: selftests: Fix __GUEST_ASSERT() format warnings in ARM's arch timer test")
from the kvm-arm tree and commit:
5448d9282af5 ("KVM: selftests: Fix spelling mistake "trigged" -> "triggered"")
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.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/kvm/aarch64/arch_timer.c
index 93100b3f1312,16ac74d07d68..000000000000
--- 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);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the kvm-riscv tree with the kvm-arm tree
@ 2025-05-21 6:48 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-21 6:48 UTC (permalink / raw)
To: Anup Patel, Christoffer Dall, Marc Zyngier
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Radim Krčmář
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
Hi all,
Today's linux-next merge of the kvm-riscv tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
a7484c80e5ca ("KVM: arm64: Allow userspace to request KVM_ARM_VCPU_EL2*")
from the kvm-arm tree and commit:
5b9db9c16f42 ("RISC-V: KVM: add KVM_CAP_RISCV_MP_STATE_RESET")
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.
--
Cheers,
Stephen Rothwell
diff --cc include/uapi/linux/kvm.h
index e6ed559d9091,454b7d4a0448..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -931,8 -930,7 +931,9 @@@ struct kvm_enable_cap
#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237
#define KVM_CAP_X86_GUEST_MODE 238
#define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239
-#define KVM_CAP_RISCV_MP_STATE_RESET 240
+#define KVM_CAP_ARM_EL2 240
+#define KVM_CAP_ARM_EL2_E2H0 241
++#define KVM_CAP_RISCV_MP_STATE_RESET 242
struct kvm_irq_routing_irqchip {
__u32 irqchip;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-05-21 6:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-27 0:29 linux-next: manual merge of the kvm-riscv tree with the kvm-arm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-21 6:48 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox