On Tue, 16 Mar 2021 at 19:23, Markus Armbruster <[email protected]> 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/armbru.git tags/pull-qom-fdc-2021-03-16 > > for you to fetch changes up to 901c36b68c327c5a4e4b3701cd991dd927ac07ae: > > memory: Drop "qemu:" prefix from QOM memory region type names (2021-03-16 > 15:52:26 +0100) > > ---------------------------------------------------------------- > QOM and fdc patches patches for 2021-03-16 >
CONFLICT (content): Merge conflict in docs/system/removed-features.rst Please fix up and resend. thanks -- PMM
