From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39435)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1W5yj8-0003dY-Kn
	for qemu-devel@nongnu.org; Wed, 22 Jan 2014 09:24:27 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1W5yj3-0006Fv-Q5
	for qemu-devel@nongnu.org; Wed, 22 Jan 2014 09:24:22 -0500
Received: from mx1.redhat.com ([209.132.183.28]:52334)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1W5yj3-0006BE-Hj
	for qemu-devel@nongnu.org; Wed, 22 Jan 2014 09:24:17 -0500
Date: Wed, 22 Jan 2014 14:10:07 +0100
From: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20140122131007.GF10065@dhcp-200-207.str.redhat.com>
References: <1390227608-7225-1-git-send-email-cyliu@suse.com>
	<1390227608-7225-8-git-send-email-cyliu@suse.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1390227608-7225-8-git-send-email-cyliu@suse.com>
Subject: Re: [Qemu-devel] [v19 07/25] gluster.c: replace QEMUOptionParameter
	with QemuOpts
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: Chunyan Liu <cyliu@suse.com>
Cc: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>, qemu-devel@nongnu.org, stefanha@redhat.com

Am 20.01.2014 um 15:19 hat Chunyan Liu geschrieben:
> gluster.c: replace QEMUOptionParameter with QemuOpts
> 
> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
> Signed-off-by: Chunyan Liu <cyliu@suse.com>

This conflicts with the queued patch "gluster: Add support for creating
zero-filled image".

Can you please rebase on top of my block branch?

Kevin