From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Pavel Tatashin <pasha.tatashin@oracle.com>,
Wanpeng Li <wanpengli@tencent.com>
Subject: Re: linux-next: manual merge of the kvm tree with the tip tree
Date: Wed, 15 Aug 2018 14:27:32 +1000 [thread overview]
Message-ID: <20180815142732.6c9108a0@canb.auug.org.au> (raw)
In-Reply-To: <20180808135445.1a85f9b5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2042 bytes --]
Hi all,
On Wed, 8 Aug 2018 13:54:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Paolo pointed out a semantic conflict between the kvm tree and the tip
> tree in
>
> arch/x86/kernel/kvm.c
>
> between commit:
>
> 368a540e0232 ("x86/kvmclock: Remove memblock dependency")
>
> from the tip tree and commit:
>
> d63bae079b64 ("KVM: X86: Add kvm hypervisor init time platform setup callback")
>
> 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.
>
> I applied the following (as suggested) after the automatic merge:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 8 Aug 2018 13:48:34 +1000
> Subject: [PATCH] kvm: x86: fix semantic conflict in platform init
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/x86/kernel/kvm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
> index 0906b8731393..e2499bad3209 100644
> --- a/arch/x86/kernel/kvm.c
> +++ b/arch/x86/kernel/kvm.c
> @@ -714,13 +714,13 @@ static void __init kvm_apic_init(void)
> static void __init kvm_init_platform(void)
> {
> x86_platform.apic_post_init = kvm_apic_init;
> + kvmclock_init();
> }
>
> const __initconst struct hypervisor_x86 x86_hyper_kvm = {
> .name = "KVM",
> .detect = kvm_detect,
> .type = X86_HYPER_KVM,
> - .init.init_platform = kvmclock_init,
> .init.guest_late_init = kvm_guest_init,
> .init.x2apic_available = kvm_para_available,
> .init.init_platform = kvm_init_platform,
> --
> 2.18.0
This is now a conflict between Linus' tree and the kvm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-08-15 4:27 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 3:54 linux-next: manual merge of the kvm tree with the tip tree Stephen Rothwell
2018-08-15 4:27 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-18 0:32 Stephen Rothwell
2022-12-01 0:18 Stephen Rothwell
2022-12-01 0:14 Stephen Rothwell
2022-12-15 23:26 ` Stephen Rothwell
2022-01-10 2:16 Stephen Rothwell
2022-01-10 2:28 ` Like Xu
2021-12-13 17:46 broonie
2021-12-13 18:14 ` Paolo Bonzini
2021-12-13 18:23 ` Mark Brown
2021-10-25 5:11 Stephen Rothwell
2021-10-21 2:39 Stephen Rothwell
2021-10-21 15:32 ` Borislav Petkov
2021-04-22 4:30 Stephen Rothwell
2021-04-22 4:45 ` Nadav Amit
2021-04-22 4:58 ` Stephen Rothwell
2021-04-22 6:29 ` Paolo Bonzini
2020-07-29 6:47 Stephen Rothwell
2020-07-17 5:25 Stephen Rothwell
2020-06-02 4:53 Stephen Rothwell
2020-06-04 3:09 ` Stephen Rothwell
2020-01-16 2:48 Stephen Rothwell
2018-12-19 4:12 Stephen Rothwell
2018-12-17 5:22 Stephen Rothwell
2018-10-19 3:25 Stephen Rothwell
2018-08-06 5:12 Stephen Rothwell
2018-08-06 6:27 ` Tianyu Lan
2018-02-02 0:51 Stephen Rothwell
2018-01-15 2:39 Stephen Rothwell
2017-08-28 4:52 Stephen Rothwell
2017-09-04 6:09 ` Stephen Rothwell
2017-08-25 4:39 Stephen Rothwell
2017-08-25 6:39 ` Paolo Bonzini
2017-08-25 13:57 ` Tom Lendacky
2017-08-25 16:53 ` Brijesh Singh
2017-08-25 20:05 ` Paolo Bonzini
2017-08-25 20:41 ` Brijesh Singh
2017-08-25 20:42 ` Paolo Bonzini
2017-08-26 7:24 ` Ingo Molnar
2016-11-28 3:56 Stephen Rothwell
2016-11-17 3:50 Stephen Rothwell
2016-11-17 7:07 ` Thomas Gleixner
2016-11-17 21:31 ` Stephen Rothwell
2016-05-12 2:54 Stephen Rothwell
2015-06-19 4:59 Michael Ellerman
2015-05-26 4:45 Stephen Rothwell
2012-11-30 4:26 Stephen Rothwell
2012-05-16 7:14 Stephen Rothwell
2012-05-16 7:53 ` Gleb Natapov
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=20180815142732.6c9108a0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=pasha.tatashin@oracle.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).