Re: [PULL v4 00/42] Block layer patches and object-add QAPIfication

[Kevin Wolf]

Am 18.03.2021 um 20:55 hat Peter Maydell geschrieben:
> On Thu, 18 Mar 2021 at 09:48, Kevin Wolf <kwolf@redhat.com> wrote:
> >
> > The following changes since commit 571d413b5da6bc6f1c2aaca8484717642255ddb0:
> >
> >   Merge remote-tracking branch 
> > 'remotes/mcayland/tags/qemu-openbios-20210316' into staging (2021-03-17 
> > 21:02:37 +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 ef11a2d8972147994492c36cd3d26677e831e4d7:
> >
> >   vl: allow passing JSON to -object (2021-03-18 10:45:01 +0100)
> >
> > ----------------------------------------------------------------
> > Block layer patches and object-add QAPIfication
> >
> > - QAPIfy object-add and --object
> > - stream: Fail gracefully if permission is denied
> > - storage-daemon: Fix crash on quit when job is still running
> > - curl: Fix use after free
> > - char: Deprecate backend aliases, fix QMP query-chardev-backends
> > - Fix image creation option defaults that exist in both the format and
> >   the protocol layer (e.g. 'cluster_size' in qcow2 and rbd; the qcow2
> >   default was incorrectly applied to the rbd layer)
> >
> 
> Auto-merging docs/system/removed-features.rst
> CONFLICT (content): Merge conflict in docs/system/removed-features.rst
> Auto-merging docs/system/deprecated.rst
> CONFLICT (content): Merge conflict in docs/system/deprecated.rst
> 
> I'm afraid your pullreq was racing with another one deprecating features :-(

I'm not sure that not resolving trivial merge conflicts on your side is
saving anyone's time. Well, v5 is coming.

Kevin