From: Peter Maydell <peter.maydell@linaro.org>
To: Markus Armbruster <armbru@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL v2 0/6] QOM and fdc patches patches for 2021-03-16
Date: Wed, 17 Mar 2021 21:01:54 +0000 [thread overview]
Message-ID: <CAFEAcA8_Xu8EJs4m0YGJU9iG7ewkicTV1_N6cJFrBmaUgzsbzQ@mail.gmail.com> (raw)
In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com>
On Tue, 16 Mar 2021 at 19:23, Markus Armbruster <armbru@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/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
prev parent reply other threads:[~2021-03-17 21:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 19:23 [PULL v2 0/6] QOM and fdc patches patches for 2021-03-16 Markus Armbruster
2021-03-16 19:23 ` [PULL v2 1/6] docs/system/deprecated: Fix note on fdc drive properties Markus Armbruster
2021-03-16 19:23 ` [PULL v2 2/6] fdc: Drop deprecated floppy configuration Markus Armbruster
2021-03-16 19:23 ` [PULL v2 3/6] fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() Markus Armbruster
2021-03-16 19:23 ` [PULL v2 4/6] blockdev: Drop deprecated bogus -drive interface type Markus Armbruster
2021-03-16 19:23 ` [PULL v2 5/6] hw: Replace anti-social QOM type names Markus Armbruster
2021-03-16 19:23 ` [PULL v2 6/6] memory: Drop "qemu:" prefix from QOM memory region " Markus Armbruster
2021-03-17 21:01 ` Peter Maydell [this message]
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=CAFEAcA8_Xu8EJs4m0YGJU9iG7ewkicTV1_N6cJFrBmaUgzsbzQ@mail.gmail.com \
--to=peter.maydell@linaro.org \
--cc=armbru@redhat.com \
--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).