On 4/28/20 7:59 AM, Max Reitz wrote:
On 24.04.20 21:09, Eric Blake wrote:
In v3:
- patch 1: fix error returns [patchew, Max], R-b dropped
- patch 2,3: unchanged, so add R-b

Eric Blake (3):
   block: Add blk_new_with_bs() helper
   qcow2: Allow resize of images with internal snapshots
   qcow2: Tweak comment about bitmaps vs. resize

Thanks, I’ve squashed the diff into patch 1 and applied the series to my
block-next branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block-next

This series has not only a merge conflict, but a semantic conflict, with the current state of Kevin's block-next branch. I think I'll go ahead and post a v4 based on Kevin's branch to spare you the efforts of having to repeat my merge resolution.

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


Reply via email to