From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sean Christopherson <seanjc@google•com>,
Anup Patel <anup@brainfault•org>
Cc: Haibo Xu <haibo1.xu@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Peter Gonda <pgonda@google•com>
Subject: linux-next: manual merge of the kvm-x86 tree with the kvm-riscv tree
Date: Thu, 7 Mar 2024 14:59:46 +1100 [thread overview]
Message-ID: <20240307145946.7e014225@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]
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 */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-03-07 3:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 3:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-29 15:00 linux-next: manual merge of the kvm-x86 tree with the kvm-riscv tree Mark Brown
2026-01-29 15:19 ` Mark Brown
2023-08-15 6:34 Stephen Rothwell
2023-08-15 6:32 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240307145946.7e014225@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=anup@brainfault$(echo .)org \
--cc=haibo1.xu@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pgonda@google$(echo .)com \
--cc=seanjc@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox