On Mon, 6 Sept 2021 at 14:13, Paolo Bonzini <[email protected]> wrote: > > The following changes since commit 31ebff513fad11f315377f6b07447169be8d9f86: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-09-03' > into staging (2021-09-04 19:21:19 +0100) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 4e3cdb6ce6048bb28d70a438081252a29563b757: > > doc: Add the SGX doc (2021-09-06 04:10:24 -0400) > > ---------------------------------------------------------------- > * SGX support (Sean, Yang) > * vGIF and vVMLOAD/VMSAVE support (Lara) > * Move GBM handling to Meson (Thomas)
Hi; this has a merge conflict in meson.build; please rebase and resend. (I think it's likely the gbm patch that Thomas mentions that's already in master.) -- PMM
