Re: [Qemu-devel] [PULL v2 00/25] Block patches

[Stefan Hajnoczi]

On Wed, Jul 20, 2016 at 10:03:17PM +0100, Peter Maydell wrote:
> On 20 July 2016 at 17:20, Stefan Hajnoczi <address@hidden> 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.

This conflict can be resolved by keeping qemu_gluster_co_pdiscard() and
dropping qemu_gluster_co_discard().

Stefan

signature.asc
Description: PGP signature