Re: [PULL v2 00/38] Misc patches (buildsys, i386, fuzzing) for 2021-01-29

[Peter Maydell]

On Mon, 1 Feb 2021 at 15:05, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 0bcd12fb1513bad44f05f2d3a8eef2a99b3077b6:
>
>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 
> (2021-01-28 12:30:30 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to e2c7c4a3f5ce0e2e529fb50e56017572c221182b:
>
>   pc-bios/descriptors: fix paths in json files (2021-02-01 13:05:51 +0100)
>
> ----------------------------------------------------------------
> * Fuzzing improvements (Qiuhao, Alexander)
> * i386: Fix BMI decoding for instructions with the 0x66 prefix (David)
> * slirp update (Marc-André)
> * initial attempt at fixing event_notifier emulation (Maxim)
> * i386: PKS emulation, fix for "qemu-system-i386 -cpu host" (myself)
> * meson: RBD test fixes (myself)
> * meson: TCI warnings (Philippe)
> * Leaner build for --disable-guest-agent, --disable-system and
>   --disable-tools (Philippe, Stefan)
> * --enable-tcg-interpreter fix (Richard)
> * i386: SVM feature bits (Wei)
> * HVF bugfix (Alex)
> * KVM bugfix (Thomas)
>
> ----------------------------------------------------------------

Conflict in configure. The fix is trivial but git seems to do weird
stuff with the submodule changes which get in the way of just
resolving the conflict in the merge conflict. Can you rebase and
resend, please?

thanks
-- PMM