On Tue, 1 Sep 2020 at 16:21, Thomas Huth <th...@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
