On Thu, 4 Feb 2021 at 09:58, Stefan Hajnoczi <stefa...@redhat.com> wrote: > > The following changes since commit 77f3804ab7ed94b471a14acb260e5aeacf26193f: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging > (2021-02-02 16:47:51 +0000) > > are available in the Git repository at: > > https://gitlab.com/stefanha/qemu.git tags/block-pull-request > > for you to fetch changes up to 026362226f1ff6a1168524a326bbd6347ad40e85: > > docs: fix Parallels Image "dirty bitmap" section (2021-02-03 16:48:21 +0000) > > ---------------------------------------------------------------- > Pull request > > The pull request includes Multi-Process QEMU, GitLab repo URL updates, and > even > a block layer patch to fix the Parallels Image format specification! > > ----------------------------------------------------------------
This has merge conflicts: Auto-merging util/oslib-posix.c CONFLICT (content): Merge conflict in util/oslib-posix.c Auto-merging util/mmap-alloc.c CONFLICT (content): Merge conflict in util/mmap-alloc.c Auto-merging softmmu/physmem.c CONFLICT (content): Merge conflict in softmmu/physmem.c Auto-merging softmmu/memory.c CONFLICT (content): Merge conflict in softmmu/memory.c Auto-merging include/qemu/mmap-alloc.h Auto-merging include/exec/ram_addr.h CONFLICT (content): Merge conflict in include/exec/ram_addr.h Auto-merging include/exec/memory.h Auto-merging hw/Kconfig Automatic merge failed; fix conflicts and then commit the result. Can you rebase and resend, please? thanks -- PMM
