[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL for-2.7 00/25] Block patches
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PULL for-2.7 00/25] Block patches |
Date: |
Wed, 20 Jul 2016 13:56:04 +0100 |
On 19 July 2016 at 19:47, Stefan Hajnoczi <address@hidden> wrote:
> The following changes since commit 1df8ffb286b65cd446b77f54418293487a85dc43:
>
> Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20160719-1' into
> staging (2016-07-19 14:07:27 +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 46ea2b6979570598d5c90e8e2d37b5cb4dfbbb62:
>
> raw_bsd: Convert to byte-based interface (2016-07-19 17:18:34 +0100)
>
> ----------------------------------------------------------------
Hi. I'm afraid this has a conflict within block/iscsi.c
which I'm not confident about being able to resolve correctly
(it looks like in one path a function has been replaced and
in another path it has had its arguments changed).
Could you rebase or otherwise resolve and resend, please?
thanks
-- PMM
- [Qemu-devel] [PULL for-2.7 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based, (continued)
- [Qemu-devel] [PULL for-2.7 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 18/25] iscsi: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 17/25] gluster: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 19/25] nbd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 20/25] qcow2: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 21/25] raw_bsd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 22/25] sheepdog: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 23/25] block: Kill .bdrv_co_discard(), Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 24/25] nbd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 25/25] raw_bsd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/19
- Re: [Qemu-devel] [PULL for-2.7 00/25] Block patches,
Peter Maydell <=