Re: [PULL v3 00/11] QAPI patches patches for 2021-03-16

[Peter Maydell]

On Fri, 19 Mar 2021 at 11:58, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit cf6b56d4f2107259f52413f979a1d474dad0c1e1:
>
>   Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210318' into 
> staging (2021-03-18 23:04:41 +0000)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2021-03-16-v3
>
> for you to fetch changes up to 64e9c1e5bc73192bbf740db40c5b2c3764dcaf05:
>
>   qapi: New -compat deprecated-input=crash (2021-03-19 11:36:52 +0100)
>
> ----------------------------------------------------------------
> QAPI patches patches for 2021-03-16
>
Conflict in storage-daemon/qemu-storage-daemon.c. I had a go at fixing
this one up, but obviously wrongly since my attempt didn't compile.
Can you rebase and resend, please?

thanks
-- PMM