From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40595)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1XcDce-0007So-SW
	for qemu-devel@nongnu.org; Thu, 09 Oct 2014 09:19:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1XcDcZ-0000Qe-Af
	for qemu-devel@nongnu.org; Thu, 09 Oct 2014 09:19:12 -0400
Received: from mail-la0-f52.google.com ([209.85.215.52]:40915)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1XcDcZ-0000QX-3j
	for qemu-devel@nongnu.org; Thu, 09 Oct 2014 09:19:07 -0400
Received: by mail-la0-f52.google.com with SMTP id hz20so1144654lab.39
	for <qemu-devel@nongnu.org>; Thu, 09 Oct 2014 06:19:05 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <1412854834-28464-1-git-send-email-pbonzini@redhat.com>
References: <1412854834-28464-1-git-send-email-pbonzini@redhat.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 9 Oct 2014 14:11:04 +0100
Message-ID: <CAFEAcA8h2BeED1yoHLR8oi8x2bt+qLcZT=94Nff+qkznN-O6gw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PULL v2 00/28] Changes for 2014-10-29
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: QEMU Developers <qemu-devel@nongnu.org>

On 9 October 2014 12:40, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit 1831e150606a221898bf46ffaf0453e9952cbb=
c4:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into s=
taging (2014-09-30 16:45:35 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to c8ee8cb6ed76d49412e5067aa1e3f7ce2d47ce46:
>
>   qemu-char: Fix reconnect socket error reporting (2014-10-09 12:57:31 +0=
200)

This one falls over a bit later on:

In file included from /home/petmay01/linaro/qemu-for-merges/vl.c:64:
/home/petmay01/linaro/qemu-for-merges/include/sysemu/accel.h:32:
error: redefinition of typedef =E2=80=98AccelState=E2=80=99
/home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:33:
error: previous declaration of =E2=80=98AccelState=E2=80=99 was here

'make -k' says that's the last one, though.

thanks
-- PMM