[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [Qemu-devel] [PULL 00/14] Block layer patches
From: |
Peter Maydell |
Subject: |
Re: [Qemu-block] [Qemu-devel] [PULL 00/14] Block layer patches |
Date: |
Wed, 20 Dec 2017 15:30:20 +0000 |
On 20 December 2017 at 13:19, Kevin Wolf <address@hidden> wrote:
> The following changes since commit af352675efb7e92a1f5f6461a042a12015ab3d12:
>
> Merge remote-tracking branch 'remotes/aurel/tags/pull-target-sh4-20171218'
> into staging (2017-12-19 19:11:11 +0000)
>
> are available in the git repository at:
>
> git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to b4d526c87b26aff6d8b353951aa175a1236ad887:
>
> nvme: Add tracing (2017-12-20 11:05:49 +0100)
>
> ----------------------------------------------------------------
> Block layer patches
Hi; this has a merge conflict in hw/block/nvme.c where both
sets of changes are changing the way that the function
handles errors, and I'm not sure which is correct. Can you
resolve and resend, please?
thanks
-- PMM
- [Qemu-block] [PULL 05/14] block: Call .drain_begin only once in bdrv_drain_all_begin(), (continued)
- [Qemu-block] [PULL 05/14] block: Call .drain_begin only once in bdrv_drain_all_begin(), Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 07/14] block: bdrv_drain_recurse(): Remove unused begin parameter, Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 06/14] test-bdrv-drain: Test BlockDriver callbacks for drain, Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 08/14] block: Don't wait for requests in bdrv_drain*_end(), Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 10/14] qemu-img: Document --force-share / -U, Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 09/14] block: Unify order in drain functions, Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 11/14] block: Don't acquire AioContext in hmp_qemu_io(), Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 12/14] qcow2: get rid of qcow2_backing_read1 routine, Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 13/14] block: Document that x-blockdev-change breaks quorum children list, Kevin Wolf, 2017/12/20
- [Qemu-block] [PULL 14/14] nvme: Add tracing, Kevin Wolf, 2017/12/20
- Re: [Qemu-block] [Qemu-devel] [PULL 00/14] Block layer patches,
Peter Maydell <=