From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37779)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aRmqg-0005OO-EY
	for qemu-devel@nongnu.org; Fri, 05 Feb 2016 15:19:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aRmqc-0004ob-9i
	for qemu-devel@nongnu.org; Fri, 05 Feb 2016 15:19:22 -0500
Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34269)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aRmqc-0004nx-1g
	for qemu-devel@nongnu.org; Fri, 05 Feb 2016 15:19:18 -0500
Received: by mail-wm0-x22c.google.com with SMTP id 128so85462024wmz.1
	for <qemu-devel@nongnu.org>; Fri, 05 Feb 2016 12:19:17 -0800 (PST)
References: <1454605920-12791-1-git-send-email-alex.bennee@linaro.org>
	<87bn7vnmvh.fsf@linaro.org>
	<CAFEAcA9nu-0JPd-ArkiwW63QobRgY2Acbg_cfk7f2nPg+Ge0dg@mail.gmail.com>
	<874mdnnk14.fsf@linaro.org>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <874mdnnk14.fsf@linaro.org>
Date: Fri, 05 Feb 2016 20:19:14 +0000
Message-ID: <871t8qap19.fsf@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PULL 0/6] Travis updates
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: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>


Alex Bennée <alex.bennee@linaro.org> writes:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
>
> Peter Maydell <peter.maydell@linaro.org> writes:
>
>> On 5 February 2016 at 16:27, Alex Bennée <alex.bennee@linaro.org> wrote:
>>>
>>> Alex Bennée <alex.bennee@linaro.org> writes:
>>>
>>>> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09ea8ec:
>>>>
>>>>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' into staging (2016-01-28 11:46:34 +0000)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>   https://github.com/stsquad/qemu.git tags/pull-build-test-20160204
>>>
>>> I had a momentary panic when I saw the email messages still had ---
>>> history on them but the tag is clean and can be pulled.
>>
>> Merge conflict in .travis.yml -- probably easy enough to fix up but
>> since I don't know anything about the travis syntax or how to test it,
>> could you rebase and fix up the conflict, please?
>
> I've pushed a signed tags/pull-build-test-20160205 but I'm still waiting
> for the job to finish and I'm about to sign off. If your around for a
> bit longer you can wait until:
>
> https://travis-ci.org/stsquad/qemu/builds/107280297
>
> goes green.

*sigh* - it looks like it failed. Try again next week :-/

>
>>
>> thanks
>> -- PMM
>
>
> - --
> Alex Bennée
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1
>
> iQEcBAEBAgAGBQJWtNvoAAoJEPvQ2wlanipE5VYH+wSubtKLq0VXlXLTHMz8oWKb
> r2fFF9XQgbYLtOlkUQ5qaGTQVSjJpwl8vOo8kyfEqJ1LvUoCpxYa14fV2F+rvIu+
> dAaxEl3QgFbOoq5eUymMBOTZaEfP0rXM/gk++a8082COFu68Vd0dV1pcHDlRwPp4
> 7AjglY9Bqx3WbIBoS8vuOfNJvzRCo/HAVw0zmlQSQMgTmx+zgeK43PzCCNTJVnA0
> YNNG46sRV+ZrdrlJ/FT7EJpPAaogINASCdFcFMHFnISB5dOlsfT5ugeemqaj7t3H
> Mb8k3PYV23cPn6fwUWqp2BkhiBh/h3uNvtBK4dz7GTL61eumBVRDXfaDVhXKhAA=
> =KDE0
> -----END PGP SIGNATURE-----


--
Alex Bennée