linux-kernel - 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>] [day] [month] [year] [list]

Message-ID: <20240307145946.7e014225@canb.auug.org.au>
Date: Thu, 7 Mar 2024 14:59:46 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Sean Christopherson <seanjc@...gle.com>, Anup Patel
 <anup@...infault.org>
Cc: Haibo Xu <haibo1.xu@...el.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Peter Gonda <pgonda@...gle.com>
Subject: linux-next: manual merge of the kvm-x86 tree with the kvm-riscv
 tree

Hi all,

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

  tools/testing/selftests/kvm/include/kvm_util_base.h

between commit:

  1e979288c9b5 ("KVM: riscv: selftests: Add guest helper to get vcpu id")

from the kvm-riscv tree and commit:

  be1bd4c5394f ("KVM: selftests: Allow tagging protected memory in guest page tables")

from the kvm-x86 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/include/kvm_util_base.h
index 39c2499df341,194963e05341..000000000000
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@@ -1081,6 -1128,6 +1128,8 @@@ void kvm_selftest_arch_init(void)
  
  void kvm_arch_vm_post_create(struct kvm_vm *vm);
  
 +uint32_t guest_get_vcpuid(void);
 +
+ bool vm_is_gpa_protected(struct kvm_vm *vm, vm_paddr_t paddr);
+ 
  #endif /* SELFTEST_KVM_UTIL_BASE_H */

Content of type "application/pgp-signature" skipped