Linux-Sgx Archive on lore.kernel.org
 help / color / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
	linux-sgx@vger.kernel.org, Andy Lutomirski <luto@kernel.org>,
	Sean Christopherson <sean.j.christopherson@intel.com>
Subject: Re: v25-rc1
Date: Tue, 14 Jan 2020 11:44:51 +0100
Message-ID: <7aa767e6-c8fa-669b-9bda-26ad18d31615@redhat.com> (raw)
In-Reply-To: <20200114093921.GC31032@zn.tnic>

On 14/01/20 10:39, Borislav Petkov wrote:
> JFYI: there'll be a merge conflict, below is me merging into linux-next
> from today.
> 
> Also, don't forget to fixup CPU_BASED_USE_TSC_OFFSETTING with "TT" since
> you hav                                                                e
> 
>   5e3d394fdd9e ("KVM: VMX: Fix the spelling of CPU_BASED_USE_TSC_OFFSETTING")
> 
> in your tree but this tree still has:
> 
> + #define CPU_BASED_USE_TSC_OFFSETING             VMCS_CONTROL_BIT(TSC_OFFSETTING)
> 
> Lemme know if there's something else I should do.

Nope, thanks for the heads up.  The topic branch will remove the need
for Linus to solve the conflict so it's definitely the way to go.

Paolo


      reply index

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-13  3:59 v25-rc1 Jarkko Sakkinen
2020-01-13  8:48 ` v25-rc1 Borislav Petkov
2020-01-13 14:00   ` v25-rc1 Paolo Bonzini
2020-01-13 14:04     ` v25-rc1 Borislav Petkov
2020-01-13 15:20       ` v25-rc1 Paolo Bonzini
2020-01-13 16:07         ` v25-rc1 Borislav Petkov
2020-01-14  9:39           ` v25-rc1 Borislav Petkov
2020-01-14 10:44             ` Paolo Bonzini [this message]

Reply instructions:

You may reply publically 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=7aa767e6-c8fa-669b-9bda-26ad18d31615@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=bp@alien8.de \
    --cc=jarkko.sakkinen@linux.intel.com \
    --cc=linux-sgx@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=sean.j.christopherson@intel.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

Linux-Sgx Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-sgx/0 linux-sgx/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-sgx linux-sgx/ https://lore.kernel.org/linux-sgx \
		linux-sgx@vger.kernel.org
	public-inbox-index linux-sgx

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-sgx


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git