[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PULL 00/27] Block patches
From: |
Peter Maydell |
Subject: |
Re: [PULL 00/27] Block patches |
Date: |
Thu, 4 Feb 2021 10:02:25 +0000 |
On Thu, 4 Feb 2021 at 09:58, Stefan Hajnoczi <stefanha@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
- [PULL 13/27] io: add qio_channel_writev_full_all helper, (continued)
- [PULL 13/27] io: add qio_channel_writev_full_all helper, Stefan Hajnoczi, 2021/02/04
- [PULL 14/27] io: add qio_channel_readv_full_all_eof & qio_channel_readv_full_all helpers, Stefan Hajnoczi, 2021/02/04
- [PULL 15/27] multi-process: define MPQemuMsg format and transmission functions, Stefan Hajnoczi, 2021/02/04
- [PULL 16/27] multi-process: Initialize message handler in remote device, Stefan Hajnoczi, 2021/02/04
- [PULL 17/27] multi-process: Associate fd of a PCIDevice with its object, Stefan Hajnoczi, 2021/02/04
- [PULL 18/27] multi-process: setup memory manager for remote device, Stefan Hajnoczi, 2021/02/04
- [PULL 19/27] multi-process: introduce proxy object, Stefan Hajnoczi, 2021/02/04
- [PULL 20/27] multi-process: add proxy communication functions, Stefan Hajnoczi, 2021/02/04
- [PULL 21/27] multi-process: Forward PCI config space acceses to the remote process, Stefan Hajnoczi, 2021/02/04
- [PULL 22/27] multi-process: PCI BAR read/write handling for proxy & remote endpoints, Stefan Hajnoczi, 2021/02/04
- Re: [PULL 00/27] Block patches,
Peter Maydell <=
- [PULL 23/27] multi-process: Synchronize remote memory, Stefan Hajnoczi, 2021/02/04
- [PULL 24/27] multi-process: create IOHUB object to handle irq, Stefan Hajnoczi, 2021/02/04
- [PULL 25/27] multi-process: Retrieve PCI info from remote process, Stefan Hajnoczi, 2021/02/04
- [PULL 26/27] multi-process: perform device reset in the remote process, Stefan Hajnoczi, 2021/02/04
- [PULL 27/27] docs: fix Parallels Image "dirty bitmap" section, Stefan Hajnoczi, 2021/02/04