From patchwork Wed Aug 8 03:54:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10559483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 160E1139A for ; Wed, 8 Aug 2018 03:54:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1C6B2A580 for ; Wed, 8 Aug 2018 03:54:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2D632A592; Wed, 8 Aug 2018 03:54:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 322102A580 for ; Wed, 8 Aug 2018 03:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbeHHGM1 (ORCPT ); Wed, 8 Aug 2018 02:12:27 -0400 Received: from ozlabs.org ([203.11.71.1]:54407 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726373AbeHHGM1 (ORCPT ); Wed, 8 Aug 2018 02:12:27 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 41lcw56280z9s2g; Wed, 8 Aug 2018 13:54:45 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1533700489; bh=v8pwCsVkBvIfxRl/JyTFpJLh4ws6XImOngUVrUbLBvM=; h=Date:From:To:Cc:Subject:From; b=VKW0G4AkinCTXEfejtz6xjEfC7zRPmUjackhizWYfc0/b3grmorcOV+Dp1SNQw55+ 3qrqjeV3mkb2uaHLDFLn5yP2DFYvwAzws4wcAla/DXZeS2I8Qz5S4kF0N1zu2izBZD ed0ipDdUdnxYFjR3Q5CfsjSfNJrjiDTH2RrKeZAAW3F+Qxxu+k1SGaqt17GXlCB6zy UZzlYoBBY9p44jRfo7BmvMWM0SW/h65+gf1lUMBRKdCfBtSfqIepapF+aqJUqFrvco jyMU1Mx5W9R0o3VdK+TBFrSIRoZZTIp+pJJlntRHwDY96JVJtKBxaHkdPM4tFWczhH /dGErnMAyxuPg== Date: Wed, 8 Aug 2018 13:54:45 +1000 From: Stephen Rothwell To: Paolo Bonzini , Radim =?utf-8?b?S3LEjW3DocWZ?= , KVM , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Pavel Tatashin , Wanpeng Li Subject: linux-next: manual merge of the kvm tree with the tip tree Message-ID: <20180808135445.1a85f9b5@canb.auug.org.au> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Date: Wed, 8 Aug 2018 13:48:34 +1000 Subject: [PATCH] kvm: x86: fix semantic conflict in platform init Signed-off-by: Stephen Rothwell --- 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,