From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44642)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aRjT5-0005Mv-1I
	for qemu-devel@nongnu.org; Fri, 05 Feb 2016 11:42:49 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aRjT0-0004FZ-Dl
	for qemu-devel@nongnu.org; Fri, 05 Feb 2016 11:42:46 -0500
Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:33878)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aRjT0-0004FQ-6E
	for qemu-devel@nongnu.org; Fri, 05 Feb 2016 11:42:42 -0500
Received: by mail-wm0-x231.google.com with SMTP id 128so78290576wmz.1
	for <qemu-devel@nongnu.org>; Fri, 05 Feb 2016 08:42:41 -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>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <CAFEAcA9nu-0JPd-ArkiwW63QobRgY2Acbg_cfk7f2nPg+Ge0dg@mail.gmail.com>
Date: Fri, 05 Feb 2016 16:42:39 +0000
Message-ID: <87a8nfnm68.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>


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?

Sneaky Paolo and Stefan getting their changes in before there is a
maintainer ;-)

I'll fix it up and address Fam's comment while I'm at it.

>
> thanks
> -- PMM


--
Alex Bennée