qemu-block
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Kevin Wolf
Subject: Re: [PULL v3 00/42] Block layer patches and object-add QAPIfication
Date: Thu, 18 Mar 2021 10:46:51 +0100

Am 17.03.2021 um 22:01 hat Peter Maydell geschrieben:
> On Tue, 16 Mar 2021 at 18:12, Kevin Wolf <kwolf@redhat.com> wrote:
> >
> > The following changes since commit 6e31b3a5c34c6e5be7ef60773e607f189eaa15f3:
> >
> >   Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' 
> > into staging (2021-03-16 10:53:47 +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 f5dda4c2186975ed75ec07b58bc6031e4867bb45:
> >
> >   vl: allow passing JSON to -object (2021-03-16 18:52:10 +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)
> >
> > ----------------------------------------------------------------
> 
> CONFLICT (content): Merge conflict in docs/system/deprecated.rst
> 
> Please fix up and resend.

Aaarrgh... I mean, the conflict resolution is trivial (we obviously want
both addititons), but I guess that means that the new pull request will
be last in the queue *again*.

Kevin




reply via email to

[Prev in Thread] Current Thread [Next in Thread]