From: "Li,Rongqing" <lirongqing@baidu•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead•org>
Subject: 答复: linux-next: manual merge of the kvm tree with Linus' tree
Date: Thu, 31 Mar 2022 02:04:28 +0000 [thread overview]
Message-ID: <c1f9b1c98be74b43960de6f4f1dd4c62@baidu.com> (raw)
In-Reply-To: <20220331104224.665e456b@canb.auug.org.au>
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/x86/kernel/kvm.c
>
> between commit:
>
> c3b037917c6a ("x86/ibt,paravirt: Sprinkle ENDBR")
>
> from Linus' tree and commit:
>
> 8c5649e00e00 ("KVM: x86: Support the vCPU preemption check with
> nopvspin and realtime hint")
>
> from the kvm 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 arch/x86/kernel/kvm.c
> index 79e0b8d63ffa,21933095a10e..000000000000
> --- a/arch/x86/kernel/kvm.c
> +++ b/arch/x86/kernel/kvm.c
> @@@ -752,6 -752,39 +752,40 @@@ static void kvm_crash_shutdown(struct p
> }
> #endif
>
> + #ifdef CONFIG_X86_32
> + __visible bool __kvm_vcpu_is_preempted(long cpu) {
> + struct kvm_steal_time *src = &per_cpu(steal_time, cpu);
> +
> + return !!(src->preempted & KVM_VCPU_PREEMPTED); }
> + PV_CALLEE_SAVE_REGS_THUNK(__kvm_vcpu_is_preempted);
> +
> + #else
> +
I am sorry; I see v3 is merged into next, this version will cause building failure, like reported in
https://www.spinics.net/lists/kvm/msg270607.html
I send a new version
https://patchwork.kernel.org/project/kvm/patch/1646891689-53368-1-git-send-email-lirongqing@baidu.com/
-Li
prev parent reply other threads:[~2022-03-31 2:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 23:42 linux-next: manual merge of the kvm tree with Linus' tree Stephen Rothwell
2022-03-31 2:04 ` Li,Rongqing [this message]
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=c1f9b1c98be74b43960de6f4f1dd4c62@baidu.com \
--to=lirongqing@baidu$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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