From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55899)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1WHy8c-0004Ls-T0
	for qemu-devel@nongnu.org; Mon, 24 Feb 2014 11:12:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1WHy8Y-0000fw-3q
	for qemu-devel@nongnu.org; Mon, 24 Feb 2014 11:12:14 -0500
Received: from mail-la0-f42.google.com ([209.85.215.42]:34960)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1WHy8X-0000fd-TU
	for qemu-devel@nongnu.org; Mon, 24 Feb 2014 11:12:10 -0500
Received: by mail-la0-f42.google.com with SMTP id ec20so1642020lab.15
	for <qemu-devel@nongnu.org>; Mon, 24 Feb 2014 08:12:08 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <1392899343-5226-1-git-send-email-pbonzini@redhat.com>
References: <1392899343-5226-1-git-send-email-pbonzini@redhat.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 24 Feb 2014 16:11:48 +0000
Message-ID: <CAFEAcA9nUiEc5QWARvAScsM0OSAUnXTLtwu3prKdpX=gDNtJNg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PULL respin 00/12] Build system changes for
	2014-02-20
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Fam Zheng <famz@redhat.com>, QEMU Developers <qemu-devel@nongnu.org>, Anthony Liguori <aliguori@amazon.com>

On 20 February 2014 12:28, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Anthony, Peter,
>
> The following changes since commit 89e4a51ca9546a7bbe1998c4e3d4a3ac3a0c19be:
>
>   Merge remote-tracking branch 'stefanha/tags/tracing-pull-request' into staging (2014-01-31 11:13:08 +0000)
>
> are available in the git repository at:
>
>   git://github.com/bonzini/qemu.git configure
>
> for you to fetch changes up to f966f9ddd175bdf82f12650c3b7b5a93cc421d88:
>
>   build: softmmu targets do not have a "main.o" file (2014-02-20 13:14:18 +0100)
>
> No changes except context, but close enough to modified lines that git flags
> a conflict.

Applied, thanks.

-- PMM