From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41112)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bPyeY-0006fH-Jc
	for qemu-devel@nongnu.org; Wed, 20 Jul 2016 17:03:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bPyeX-00018r-LA
	for qemu-devel@nongnu.org; Wed, 20 Jul 2016 17:03:38 -0400
Received: from mail-vk0-x236.google.com ([2607:f8b0:400c:c05::236]:35677)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bPyeX-00018l-Ge
	for qemu-devel@nongnu.org; Wed, 20 Jul 2016 17:03:37 -0400
Received: by mail-vk0-x236.google.com with SMTP id w127so86405711vkh.2
	for <qemu-devel@nongnu.org>; Wed, 20 Jul 2016 14:03:37 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <1469031682-21863-1-git-send-email-stefanha@redhat.com>
References: <1469031682-21863-1-git-send-email-stefanha@redhat.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 20 Jul 2016 22:03:17 +0100
Message-ID: <CAFEAcA8VgMEiFAdBS5WdhbyYC5f-L3kv=VZBY+iL_pA35L+btA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PULL v2 00/25] Block 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: Stefan Hajnoczi <stefanha@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>

On 20 July 2016 at 17:20, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 338404d061144956b76f9893ca3434d057dff2d4:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160719' into staging (2016-07-20 12:48:18 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to decaeed7734bddc95e2c81858fbbec3e923310a1:
>
>   raw_bsd: Convert to byte-based interface (2016-07-20 14:24:25 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
> v2:
>  * Resolved merge conflict with block/iscsi.c [Peter]
>
> ----------------------------------------------------------------

Conflict in block/gluster.c now :-(

diff --cc block/gluster.c
index 296bd99,ef3b0de..0000000
--- a/block/gluster.c
+++ b/block/gluster.c
@@@ -1077,9 -724,8 +1077,14 @@@ error
  }

  #ifdef CONFIG_GLUSTERFS_DISCARD
++<<<<<<< HEAD
 +static coroutine_fn int qemu_gluster_co_discard(BlockDriverState *bs,
 +                                                int64_t sector_num,
 +                                                int nb_sectors)
++=======
+ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
+                                                  int64_t offset, int size)
++>>>>>>> remotes/stefanha/tags/block-pull-request
  {
      int ret;
      GlusterAIOCB acb;


Maybe that's an easy resolve but I don't want to dig into it
this evening, so I'll merge something else instead. If it
is easy let me know and I can re-attempt the merge and fix
the conflict.

thanks
-- PMM