From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:50338)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aliguori@us.ibm.com>) id 1USDVf-0007Zv-G2
	for qemu-devel@nongnu.org; Tue, 16 Apr 2013 17:33:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <aliguori@us.ibm.com>) id 1USDVe-0002hB-Ij
	for qemu-devel@nongnu.org; Tue, 16 Apr 2013 17:33:51 -0400
Received: from e23smtp03.au.ibm.com ([202.81.31.145]:53600)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aliguori@us.ibm.com>) id 1USDVe-0002gF-1F
	for qemu-devel@nongnu.org; Tue, 16 Apr 2013 17:33:50 -0400
Received: from /spool/local
	by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <qemu-devel@nongnu.org> from <aliguori@us.ibm.com>;
	Wed, 17 Apr 2013 07:26:06 +1000
Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152])
	by d23dlp01.au.ibm.com (Postfix) with ESMTP id 1819F2CE804A
	for <qemu-devel@nongnu.org>; Wed, 17 Apr 2013 07:33:36 +1000 (EST)
Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97])
	by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id
	r3GLK0Q47602434
	for <qemu-devel@nongnu.org>; Wed, 17 Apr 2013 07:20:01 +1000
Received: from d23av03.au.ibm.com (loopback [127.0.0.1])
	by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id
	r3GLXYfC011193
	for <qemu-devel@nongnu.org>; Wed, 17 Apr 2013 07:33:34 +1000
From: Anthony Liguori <aliguori@us.ibm.com>
In-Reply-To: <1366145785.7855.4.camel@haakon3.risingtidesystems.com>
References: <874nf6e2mp.fsf@codemonkey.ws>
	<1366145785.7855.4.camel@haakon3.risingtidesystems.com>
Date: Tue, 16 Apr 2013 16:33:29 -0500
Message-ID: <87wqs2p3di.fsf@codemonkey.ws>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Re: [Qemu-devel] Is anyone rebasing the tcm_vhost QEMU patches?
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
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>

"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