On 19 May 2016 at 16:53, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 19 May 2016 at 15:43, Paolo Bonzini <pbonz...@redhat.com> wrote: >> The following changes since commit 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3: >> >> Merge remote-tracking branch >> 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging (2016-05-19 >> 09:27:28 +0100) >> >> are available in the git repository at: >> >> git://github.com/bonzini/qemu.git tags/for-upstream >> >> for you to fetch changes up to df43d49cb8708b9c88a20afe0d1a3089b550a5b8: >> >> hw: clean up hw/hw.h includes (2016-05-19 16:42:30 +0200) >> >> ---------------------------------------------------------------- >> NEED_CPU_H cleanups, big enough to deserve their own pull request. >> >> ---------------------------------------------------------------- > > Applied, thanks.
...there seem to be some travis build failures: https://travis-ci.org/qemu/qemu/builds/131457562 TCI seems to be broken, as is hw/timer/aspeed_timer.c. The latter is probably just a missing #include "qemu/log.h". Would you mind having a look? thanks -- PMM
