From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Ed Maste <emaste@freebsd.org>,
QEMU Developers <qemu-devel@nongnu.org>,
Li-Wen Hsu <lwhsu@freebsd.org>
Subject: Re: [PULL 0/8] Cirrus-CI improvements, and other CI-related fixes, m68k
Date: Wed, 2 Sep 2020 16:13:58 +0200 [thread overview]
Message-ID: <9844626b-84c8-5d6e-4611-63a3f76b11ea@redhat.com> (raw)
In-Reply-To: <CAFEAcA-RpQHgafHGvgBE_w2xZjJ4abWKNWXO3VO9yXwD5V=vNA@mail.gmail.com>
On 02/09/2020 14.56, Peter Maydell wrote:
> On Tue, 1 Sep 2020 at 16:21, Thomas Huth <thuth@redhat.com> wrote:
>>
>> Hi Peter,
>>
>> the following changes since commit 2f4c51c0f384d7888a04b4815861e6d5fd244d75:
>>
>> Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200831-pull-request' into staging (2020-08-31 19:39:13 +0100)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/huth/qemu.git tags/pull-request-2020-09-01
>>
>> for you to fetch changes up to df496fb0532758cffb5ad4075b4e60a43c723492:
>>
>> hw/m68k: QOMify the mcf5206 system integration module (2020-09-01 17:09:17 +0200)
>>
>> ----------------------------------------------------------------
>> - Cirrus-CI improvements and fixes (compile with -Werror & fix for 1h problem)
>> - Two build system fixes to fix some failures the CI
>> - One m68k QOMification patch
>> ----------------------------------------------------------------
>
> Hi -- this has a conflict in pc-bios/keymaps/meson.build (probably
> a clash with Paolo's series I just merged). Could you rebase and
> resend, please?
Sure, will do.
Thomas
prev parent reply other threads:[~2020-09-02 14:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 15:20 [PULL 0/8] Cirrus-CI improvements, and other CI-related fixes, m68k Thomas Huth
2020-09-01 15:20 ` [PULL 1/8] configure: Fix atomic64 test for --enable-werror on macOS Thomas Huth
2020-09-01 15:20 ` [PULL 2/8] cirrus.yml: Compile FreeBSD with -Werror Thomas Huth
2020-09-01 15:20 ` [PULL 3/8] cirrus.yml: Compile macOS " Thomas Huth
2020-09-01 15:20 ` [PULL 4/8] cirrus.yml: Update the macOS jobs to Catalina Thomas Huth
2020-09-01 15:20 ` [PULL 5/8] cirrus.yml: Split FreeBSD job into two parts Thomas Huth
2020-09-01 15:20 ` [PULL 6/8] meson: fix keymaps without qemu-keymap Thomas Huth
2020-09-01 15:20 ` [PULL 7/8] configure: Add system = 'linux' for meson when cross-compiling Thomas Huth
2020-09-01 15:20 ` [PULL 8/8] hw/m68k: QOMify the mcf5206 system integration module Thomas Huth
2020-09-02 12:56 ` [PULL 0/8] Cirrus-CI improvements, and other CI-related fixes, m68k Peter Maydell
2020-09-02 14:13 ` Thomas Huth [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=9844626b-84c8-5d6e-4611-63a3f76b11ea@redhat.com \
--to=thuth@redhat.com \
--cc=emaste@freebsd.org \
--cc=lwhsu@freebsd.org \
--cc=peter.maydell@linaro.org \
--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).