linux-kernel - Re: linux-next: manual merge of the kvm-x86 tree with the kvm-riscv tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1b6ee2e4-c880-4d8f-af16-aeeadaffb1ae@sirena.org.uk>
Date: Thu, 29 Jan 2026 15:19:56 +0000
From: Mark Brown <broonie@...nel.org>
To: Sean Christopherson <seanjc@...gle.com>
Cc: Anup Patel <anup@...infault.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Wu Fei <wu.fei9@...echips.com.cn>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm-riscv
 tree

On Thu, Jan 29, 2026 at 03:00:39PM +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
> 
>   tools/testing/selftests/kvm/lib/riscv/processor.c
> 
> between commit:
> 
>   7631f7b1ccc9e ("KVM: riscv: selftests: Add riscv vm satp modes")
> 
> from the kvm-riscv tree and commit:
> 
>   9f073ac25b4c4 ("KVM: selftests: Add "struct kvm_mmu" to track a given MMU instance")
> 
> from the kvm-x86 tree.

This also nsees the semantic fixup below:

From 11021bad2a6d62224d9216da62023e1a79cdd0dc Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@...nel.org>
Date: Thu, 29 Jan 2026 15:12:25 +0000
Subject: [PATCH] KVM: selftests: Fix up semantic changes

Signed-off-by: Mark Brown <broonie@...nel.org>
---
 tools/testing/selftests/kvm/lib/kvm_util.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 265e173b73709..1959bf556e88e 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -359,17 +359,17 @@ struct kvm_vm *____vm_create(struct vm_shape shape)
 	case VM_MODE_P56V57_4K:
 	case VM_MODE_P50V57_4K:
 	case VM_MODE_P41V57_4K:
-		vm->pgtable_levels = 5;
+		vm->mmu.pgtable_levels = 5;
 		break;
 	case VM_MODE_P56V48_4K:
 	case VM_MODE_P50V48_4K:
 	case VM_MODE_P41V48_4K:
-		vm->pgtable_levels = 4;
+		vm->mmu.pgtable_levels = 4;
 		break;
 	case VM_MODE_P56V39_4K:
 	case VM_MODE_P50V39_4K:
 	case VM_MODE_P41V39_4K:
-		vm->pgtable_levels = 3;
+		vm->mmu.pgtable_levels = 3;
 		break;
 	default:
 		TEST_FAIL("Unknown guest mode: 0x%x", vm->mode);
-- 
2.47.3


Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)