From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: buildbot failure in qemu-kvm on disable_kvm_x86_64_debian_5_0
Date: Thu, 25 Feb 2010 19:20:40 +0100
Message-ID: <4B86BF78.7030206@redhat.com>
References: <20100225122619.50F49BF77@buildbot.b1-systems.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: gollub@b1-systems.de, kvm@vger.kernel.org
To: qemu-kvm@buildbot.b1-systems.de
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-bw0-f209.google.com ([209.85.218.209]:40005 "EHLO
	mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S933269Ab0BYSUx (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 25 Feb 2010 13:20:53 -0500
Received: by bwz1 with SMTP id 1so3084110bwz.21
        for <kvm@vger.kernel.org>; Thu, 25 Feb 2010 10:20:51 -0800 (PST)
In-Reply-To: <20100225122619.50F49BF77@buildbot.b1-systems.de>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 02/25/2010 01:26 PM, qemu-kvm@buildbot.b1-systems.de 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@us.ibm.com>,Alexander Graf<agraf@suse.de>,Amit Shah<amit.shah@redhat.com>,Anthony Liguori<aliguori@us.ibm.com>,Blue Swirl<blauwirbel@gmail.com>,David Ahern<daahern@cisco.com>,Edgar E. Iglesias<edgar.iglesias@gmail.com>,Edgar E. Iglesias<edgar.iglesias@petalogix.com>,Jan Kiszka<jan.kiszka@siemens.com>,Jay Foad<jay.foad@gmail.com>,Jes Sorensen<Jes.Sorensen@redhat.com>,Juergen Lock<nox@jelal.kn-bremen.de>,Justin T. Gibbs<gibbs@FreeBSD.org>,Kevin O'Connor<kevin@koconnor.net>,Kevin Wolf<kwolf@redhat.com>,Luiz Capitulino<lcapitulino@redhat.com>,Marcelo Tosatti<mtosatti@redhat.com>,Markus Armbruster<armbru@redhat.com>,Michael S. Tsirkin<mst@redhat.com>,Naphtali Sprei<nsprei@redhat.com>,Paolo Bonzini<pbonzini@redhat.com>,Paul Brook<paul@codesourcery.
>   com>,Rabin Vincent<rabin@rab.in>,Richard Henderson<rth@twiddle.net>,Stefan Weil<weil@mail.berlios.de>,john cooper<john.cooper@redhat.com>,malc<av1474@comtv.ru>

These are a merge conflict and should be fixed by the next merge from 
upstream.

Paolo