From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail.linuxfoundation.org ([140.211.169.12]:41740 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754534AbeDYOZt (ORCPT
        <rfc822;stable@vger.kernel.org>); Wed, 25 Apr 2018 10:25:49 -0400
Date: Wed, 25 Apr 2018 16:25:42 +0200
From: Greg KH <gregkh@linuxfoundation.org>
To: Youquan Song <youquan.song@intel.com>
Cc: stable@vger.kernel.org, tim.c.chen@linux.intel.com,
        ashok.raj@intel.com, dave.hansen@intel.com,
        yi.y.sun@linux.intel.com, youquan.song@linux.intel.com,
        Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH 16/24] KVM: VMX: introduce alloc_loaded_vmcs
Message-ID: <20180425142542.GC25610@kroah.com>
References: <1524021512-24022-1-git-send-email-youquan.song@intel.com>
 <1524021512-24022-17-git-send-email-youquan.song@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1524021512-24022-17-git-send-email-youquan.song@intel.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Wed, Apr 18, 2018 at 11:18:24AM +0800, Youquan Song wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
> 
> (cherry picked from commit f21f165ef922c2146cc5bdc620f542953c41714b)
> 
> Group together the calls to alloc_vmcs and loaded_vmcs_init.  Soon we'll also
> allocate an MSR bitmap there.
> 
> Cc: stable@vger.kernel.org       # prereq for Spectre mitigation
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com> [v4.4 backport]
> 
> Conflicts:
> 	arch/x86/kvm/vmx.c

And again...