| Message ID | 20180808135445.1a85f9b5@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the kvm tree with the tip tree | expand |
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.
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,
Hi all, 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(-)