From: Paolo Bonzini <pbonzini@redhat.com>
To: Wei Liu <wei.liu@kernel.org>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: KVM <kvm@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jon Doron <arilou@gmail.com>,
Michael Kelley <mikelley@microsoft.com>
Subject: Re: linux-next: manual merge of the hyperv tree with the kvm tree
Date: Tue, 2 Jun 2020 18:26:26 +0200 [thread overview]
Message-ID: <feb8e292-8dff-58ad-0bb2-5006bf475e6b@redhat.com> (raw)
In-Reply-To: <20200602135618.5iw6zd2jqzqqcwxm@liuwe-devbox-debian-v2.j3c5onc20sse1dnehy4noqpfcg.zx.internal.cloudapp.net>
On 02/06/20 15:56, Wei Liu wrote:
>>
>> between commit:
>>
>> 22ad0026d097 ("x86/hyper-v: Add synthetic debugger definitions")
>>
> Paolo
>
> As far as I can tell you merged that series a few days ago. Do you plan
> to submit it to Linus in this merge window? How do you want to proceed
> to fix the conflict?
Hi, Linus can fix this conflict.
Paolo
next prev parent reply other threads:[~2020-06-02 16:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 7:18 linux-next: manual merge of the hyperv tree with the kvm tree Stephen Rothwell
2020-06-02 13:56 ` Wei Liu
2020-06-02 16:26 ` Paolo Bonzini [this message]
2020-06-02 16:29 ` Wei Liu
Reply instructions:
You may reply publicly 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=feb8e292-8dff-58ad-0bb2-5006bf475e6b@redhat.com \
--to=pbonzini@redhat.com \
--cc=arilou@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=sfr@canb.auug.org.au \
--cc=wei.liu@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox