On 02/25/2010 01:26 PM, qemu-kvm@xxxxxxxxxxxxxxxxxxxxxx wrote:
The Buildbot has detected a new failure of disable_kvm_x86_64_debian_5_0 on qemu-kvm. Full details are available at: http://buildbot.b1-systems.de/qemu-kvm/builders/disable_kvm_x86_64_debian_5_0/builds/283 Buildbot URL: http://buildbot.b1-systems.de/qemu-kvm/ Buildslave for this Build: b1_qemu_kvm_1 Build Reason: Build Source Stamp: [branch master] HEAD Blamelist: Adam Litke<agl@xxxxxxxxxx>,Alexander Graf<agraf@xxxxxxx>,Amit Shah<amit.shah@xxxxxxxxxx>,Anthony Liguori<aliguori@xxxxxxxxxx>,Blue Swirl<blauwirbel@xxxxxxxxx>,David Ahern<daahern@xxxxxxxxx>,Edgar E. Iglesias<edgar.iglesias@xxxxxxxxx>,Edgar E. Iglesias<edgar.iglesias@xxxxxxxxxxxxx>,Jan Kiszka<jan.kiszka@xxxxxxxxxxx>,Jay Foad<jay.foad@xxxxxxxxx>,Jes Sorensen<Jes.Sorensen@xxxxxxxxxx>,Juergen Lock<nox@xxxxxxxxxxxxxxxxxx>,Justin T. Gibbs<gibbs@xxxxxxxxxxx>,Kevin O'Connor<kevin@xxxxxxxxxxxx>,Kevin Wolf<kwolf@xxxxxxxxxx>,Luiz Capitulino<lcapitulino@xxxxxxxxxx>,Marcelo Tosatti<mtosatti@xxxxxxxxxx>,Markus Armbruster<armbru@xxxxxxxxxx>,Michael S. Tsirkin<mst@xxxxxxxxxx>,Naphtali Sprei<nsprei@xxxxxxxxxx>,Paolo Bonzini<pbonzini@xxxxxxxxxx>,Paul Brook<paul@codesourcery. com>,Rabin Vincent<rabin@xxxxxx>,Richard Henderson<rth@xxxxxxxxxxx>,Stefan Weil<weil@xxxxxxxxxxxxxxx>,john cooper<john.cooper@xxxxxxxxxx>,malc<av1474@xxxxxxxx>
These are a merge conflict and should be fixed by the next merge from upstream.
Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
