Re: [PULL v3 0/6] QOM and fdc patches patches for 2021-03-16

[Peter Maydell]

On Thu, 18 Mar 2021 at 12:27, Markus Armbruster <armbru@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/armbru.git tags/pull-qom-fdc-2021-03-16-v3
>
> for you to fetch changes up to 3e659bd899d321fb4a56527cb8e5d3662a889c11:
>
>   memory: Drop "qemu:" prefix from QOM memory region type names (2021-03-18 
> 09:54:27 +0100)
>
> ----------------------------------------------------------------
> QOM and fdc patches patches for 2021-03-16
>

CONFLICT (content): Merge conflict in docs/system/removed-features.rst

Can you fix up and resend, please?

thanks
-- PMM