From patchwork Mon Dec 17 05:22:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10732741 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 3A78313AD for ; Mon, 17 Dec 2018 05:22:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 228FE29CF1 for ; Mon, 17 Dec 2018 05:22:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20C8129D34; Mon, 17 Dec 2018 05:22:47 +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 74F0F29CF1 for ; Mon, 17 Dec 2018 05:22:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726436AbeLQFWj (ORCPT ); Mon, 17 Dec 2018 00:22:39 -0500 Received: from ozlabs.org ([203.11.71.1]:42553 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726324AbeLQFWj (ORCPT ); Mon, 17 Dec 2018 00:22:39 -0500 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 43J8fv52lzz9s8r; Mon, 17 Dec 2018 16:22:29 +1100 (AEDT) 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=1545024156; bh=SQ0vqzxqHO0cZNxGkzFDfeMICmQLIabYvMcs6qDBxfA=; h=Date:From:To:Cc:Subject:From; b=FqdvmRLiwGu9z/YrKX1BWHJRDi9rQSsflcRjrreeB7TuY9otT+fq9SR3i5JMUBNzk cFs0OxlOia9B4st9/gV4o6Eb7adOemSWIWEp5H9jo3CJdxmjLIZ5RbyAnV/wKEIEnM IYIEOW1EdvmpuK7qd+JzmumuHu+fYleZJSkyffWLt/zOkD4kWHYgBYRgihefVSKuPc 2hEgvEDRbyn0oxH5k4xeSQLEQ1UQ+eDvx959jXy+MYUdfwj1pm7Ycn78Ve/D+wYJa6 KV4RofkK/nesEh7hYcB9yfPqDCHz/UJyZKxZjmOYIkR5r9j38l+gcd48d4oQ0OgHqv k9gctqSgwjyKw== Date: Mon, 17 Dec 2018 16:22:28 +1100 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 , Sean Christopherson Subject: linux-next: manual merge of the kvm tree with the tip tree Message-ID: <20181217162228.3c30feec@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, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: a97673a1c43d ("x86: Fix various typos in comments") from the tip tree and commit: a821bab2d1ee ("KVM: VMX: Move VMX specific files to a "vmx" subdirectory") from the kvm tree. I fixed it up (I removed the file and then made the same changes to the file in its new position (one change was already fixed)) 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. diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index b8fa74ce3af2..c90fffdc5a93 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2214,7 +2214,7 @@ static __init int alloc_kvm_area(void) * vmcs->revision_id to KVM_EVMCS_VERSION instead of * revision_id reported by MSR_IA32_VMX_BASIC. * - * However, even though not explictly documented by + * However, even though not explicitly documented by * TLFS, VMXArea passed as VMXON argument should * still be marked with revision_id reported by * physical CPU.