From: Peter Maydell <peter.maydell@linaro.org>
To: Markus Armbruster <armbru@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL v3 0/6] QOM and fdc patches patches for 2021-03-16
Date: Thu, 18 Mar 2021 23:04:10 +0000 [thread overview]
Message-ID: <CAFEAcA8smviRfjAo2=pv6NNEz76kz51VYB4cXN4Hf6LssSCqmQ@mail.gmail.com> (raw)
In-Reply-To: <20210318122739.634472-1-armbru@redhat.com>
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
prev parent reply other threads:[~2021-03-18 23:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 12:27 [PULL v3 0/6] QOM and fdc patches patches for 2021-03-16 Markus Armbruster
2021-03-18 23:04 ` 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='CAFEAcA8smviRfjAo2=pv6NNEz76kz51VYB4cXN4Hf6LssSCqmQ@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).