On 16/09/2015 17:08, Peter Maydell wrote: > On 16 September 2015 at 13:29, Paolo Bonzini <pbonz...@redhat.com> wrote: >> The following changes since commit 007e620a7576e4ce2ea6955541e87d8ae8ed32ae: >> >> Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into >> staging (2015-09-14 18:51:09 +0100) >> >> are available in the git repository at: >> >> git://github.com/bonzini/qemu.git tags/for-upstream >> >> for you to fetch changes up to 54ac801d5d1d5618344f65132f0d707c8c620df4: >> >> Revert "rcu: init rcu_registry_lock after fork" (2015-09-16 14:27:59 +0200) >> >> ---------------------------------------------------------------- >> * Linux header update and cleanup >> * Support for HyperV crash report >> * Cleanup of target-specific HMP commands >> * Multiarch batch >> * Checkpatch fix for Perl 5.22 >> * NBD fix >> * Revert incorrect commit 5243722376 > > Hi. I'm afraid this fails to build on my w32 config: > > CC i386-softmmu/arch_init.o > In file included from /home/petmay01/linaro/qemu-for-merges/monitor.c:66: > /home/petmay01/linaro/qemu-for-merges/include/monitor/monitor-common.h:35: > error: redefinition of typedef ‘MonitorDef’ > /home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:83: > error: previous declaration of ‘MonitorDef’ was here
The usual problem with different compiler versions. :( Fixed up and resent. Paolo
