From: Peter Maydell <peter.maydell@linaro.org>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PULL v2 00/25] Block patches
Date: Wed, 20 Jul 2016 22:03:17 +0100 [thread overview]
Message-ID: <CAFEAcA8VgMEiFAdBS5WdhbyYC5f-L3kv=VZBY+iL_pA35L+btA@mail.gmail.com> (raw)
In-Reply-To: <1469031682-21863-1-git-send-email-stefanha@redhat.com>
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
next prev parent reply other threads:[~2016-07-20 21:03 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-20 16:20 [Qemu-devel] [PULL v2 00/25] Block patches Stefan Hajnoczi
2016-07-20 16:20 ` [Qemu-devel] [PULL v2 01/25] block: Fragment reads to max transfer length Stefan Hajnoczi
2016-07-20 16:20 ` [Qemu-devel] [PULL v2 02/25] raw_bsd: Don't advertise flags not supported by protocol layer Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 03/25] block: Fragment writes to max transfer length Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 04/25] nbd: Rely on block layer to break up large requests Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 05/25] nbd: Drop unused offset parameter Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 06/25] iscsi: Rely on block layer to break up large requests Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 07/25] block: Convert bdrv_co_discard() to byte-based Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 08/25] block: Convert bdrv_discard() " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 09/25] block: Switch BlockRequest " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 10/25] block: Convert bdrv_aio_discard() " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 11/25] block: Convert BB interface to byte-based discards Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 12/25] raw-posix: Switch paio_submit() to byte-based Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 13/25] rbd: Switch rbd_start_aio() " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 14/25] block: Convert .bdrv_aio_discard() " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 15/25] block: Add .bdrv_co_pdiscard() driver callback Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 17/25] gluster: " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 18/25] iscsi: " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 19/25] nbd: " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 20/25] qcow2: " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 21/25] raw_bsd: " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 22/25] sheepdog: " Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 23/25] block: Kill .bdrv_co_discard() Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 24/25] nbd: Convert to byte-based interface Stefan Hajnoczi
2016-07-20 16:21 ` [Qemu-devel] [PULL v2 25/25] raw_bsd: " Stefan Hajnoczi
2016-07-20 21:03 ` Peter Maydell [this message]
2016-07-21 9:58 ` [Qemu-devel] [PULL v2 00/25] Block patches Stefan Hajnoczi
2016-07-21 10:47 ` Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2010-09-08 13:29 Kevin Wolf
2010-09-08 19:30 ` Anthony Liguori
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='CAFEAcA8VgMEiFAdBS5WdhbyYC5f-L3kv=VZBY+iL_pA35L+btA@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).