On Fri, 4 Sep 2020 at 12:45, Paolo Bonzini <pbonz...@redhat.com> wrote: > > The following changes since commit 67a7bfe560a1bba59efab085cb3430f45176d382: > > Merge remote-tracking branch > 'remotes/huth-gitlab/tags/pull-request-2020-09-03' into staging (2020-09-03 > 16:58:25 +0100) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 4be1987db8b361f17c50bea582c6056cd54c4752: > > meson: remove linkage of sdl to baum (2020-09-04 07:33:28 -0400) > > Finally a favorable diffstat appears... > > ---------------------------------------------------------------- > meson related: > * convert unit tests > * bugfixes for mtest2make > * miscellaneous bugfixes > * dead code removal and configure cleanups > * oss-fuzz fixes > * msys fixes
Merge conflict in meson.build (looks fairly minor but I wasn't sure of the resolution). Could you rebase and resend, please ? thanks -- PMM