| Message ID | 20200901152050.255165-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
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? thanks -- PMM
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
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 ---------------------------------------------------------------- Gerd Hoffmann (1): meson: fix keymaps without qemu-keymap Thomas Huth (7): configure: Fix atomic64 test for --enable-werror on macOS cirrus.yml: Compile FreeBSD with -Werror cirrus.yml: Compile macOS with -Werror cirrus.yml: Update the macOS jobs to Catalina cirrus.yml: Split FreeBSD job into two parts configure: Add system = 'linux' for meson when cross-compiling hw/m68k: QOMify the mcf5206 system integration module .cirrus.yml | 43 +++++++++++++++++++++++++++++++++---------- configure | 13 ++++++++----- hw/m68k/an5206.c | 14 ++++++++++++-- hw/m68k/mcf5206.c | 44 +++++++++++++++++++++++++++++++++++--------- include/hw/m68k/mcf.h | 3 +-- pc-bios/keymaps/meson.build | 28 +++++++++++++++++++--------- 6 files changed, 108 insertions(+), 37 deletions(-)