qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@us.ibm.com>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Cc: Michael Tsirkin <mst@redhat.com>,
	Asias He <asias.hejun@gmail.com>,
	qemu-devel@nongnu.org,
	target-devel <target-devel@vger.kernel.org>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [Qemu-devel] Is anyone rebasing the tcm_vhost QEMU patches?
Date: Tue, 16 Apr 2013 16:33:29 -0500	[thread overview]
Message-ID: <87wqs2p3di.fsf@codemonkey.ws> (raw)
In-Reply-To: <1366145785.7855.4.camel@haakon3.risingtidesystems.com>

"Nicholas A. Bellinger" <nab@linux-iscsi.org> writes:

> On Tue, 2013-04-16 at 13:45 -0500, Anthony Liguori wrote:
>> I know there are a few different trees out there.  Not sure if anyone is
>> currently working on rebasing the earlier patch series.  I had thought
>> we were aiming for 1.5 but we're getting pretty late for that.
>> 
>
> Hi Anthony,
>
> The branch against maineline qemu from 3-29 that I've been using is
> here:
>
> https://git.kernel.org/cgit/virt/kvm/nab/qemu-kvm.git/log/?h=vhost-scsi-for-1.4
>
> Last time I checked with Paolo two weeks ago he was including this into
> scsi-next.
>
> Paolo, is this ready to go, or shall I rebase + repost for you to merge
> for 1.5..?

Not sure if Paolo has already done the rebase, but there are quite a few
merge conflicts with your branch due to the virtio refactoring from
Fred.

Regards,

Anthony Liguori

>
> --nab

  reply	other threads:[~2013-04-16 21:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-16 18:45 [Qemu-devel] Is anyone rebasing the tcm_vhost QEMU patches? Anthony Liguori
2013-04-16 20:56 ` Nicholas A. Bellinger
2013-04-16 21:33   ` Anthony Liguori [this message]
2013-04-17  8:44   ` Paolo Bonzini

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=87wqs2p3di.fsf@codemonkey.ws \
    --to=aliguori@us.ibm.com \
    --cc=asias.hejun@gmail.com \
    --cc=mst@redhat.com \
    --cc=nab@linux-iscsi.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=target-devel@vger.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;
as well as URLs for NNTP newsgroup(s).