On Sun, 14 Mar 2021 at 17:54, Paolo Bonzini <pbonz...@redhat.com> wrote: > > The following changes since commit 0436c55edf6b357ff56e2a5bf688df8636f83456: > > Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' > into staging (2021-03-08 13:51:41 +0000) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream-meson-0.57 > > for you to fetch changes up to ddbac656401866a1a48d4829b5d02c239d1e8fc3: > > hexagon: use env keyword argument to pass PYTHONPATH (2021-03-13 19:26:03 > +0100) > > ---------------------------------------------------------------- > Update Meson to 0.57. > > ----------------------------------------------------------------
Merge conflict in tests/meson.build -- could you fix up and resend, please? thanks -- PMM
