qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Kevin Wolf <kwolf@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
	Qemu-block <qemu-block@nongnu.org>
Subject: Re: [PULL v4 00/42] Block layer patches and object-add QAPIfication
Date: Thu, 18 Mar 2021 19:55:04 +0000	[thread overview]
Message-ID: <CAFEAcA9R4LCogF4va2o1BefjZcFYUkwS2mQLM4JWnrCeFvx1UQ@mail.gmail.com> (raw)
In-Reply-To: <20210318094807.10472-1-kwolf@redhat.com>

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 :-(

thanks
-- PMM


  reply	other threads:[~2021-03-18 19:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-18  9:48 [PULL v4 00/42] Block layer patches and object-add QAPIfication Kevin Wolf
2021-03-18 19:55 ` Peter Maydell [this message]
2021-03-19  9:19   ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAFEAcA9R4LCogF4va2o1BefjZcFYUkwS2mQLM4JWnrCeFvx1UQ@mail.gmail.com \
    --to=peter.maydell@linaro.org \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).