From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRkC6-0006YG-Ll for qemu-devel@nongnu.org; Fri, 05 Feb 2016 12:29:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRkC3-0007u0-6n for qemu-devel@nongnu.org; Fri, 05 Feb 2016 12:29:18 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:34468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRkC2-0007tQ-Sl for qemu-devel@nongnu.org; Fri, 05 Feb 2016 12:29:15 -0500 Received: by mail-wm0-x231.google.com with SMTP id 128so80054598wmz.1 for ; Fri, 05 Feb 2016 09:29:14 -0800 (PST) References: <1454605920-12791-1-git-send-email-alex.bennee@linaro.org> <87bn7vnmvh.fsf@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: Date: Fri, 05 Feb 2016 17:28:55 +0000 Message-ID: <874mdnnk14.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 0/6] Travis updates List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers =2D----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Peter Maydell writes: > On 5 February 2016 at 16:27, Alex Benn=C3=A9e wr= ote: >> >> Alex Benn=C3=A9e writes: >> >>> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09e= a8ec: >>> >>> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' int= o 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. > > thanks > -- PMM =2D -- Alex Benn=C3=A9e =2D----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJWtNvXAAoJEPvQ2wlanipEBesH/jKiJcv8qt+a4qJ8tq80UilF rLbgOMnKxliUGQG7ITqOL2lIYrXex7J/6iO1/mdSPJ4GLy/6hoHzVzBdD0m/soV0 CwS3KSZiQLFc9M17WZ3NqpF/zGsKb0FNrr7zm1J72rgXtNmLiDLCpoVgJzfdxjtp 0KObW9OJSQ2AiG77G1awpdW6OEwn+YkOOtXpNYPFkpWouHr1Ryt99Sgpi6jnZmm1 0ksZwvyehIeR2+eqaFleSuafe9XWC5J+QRYixpINIsSVQOLLaRRBX5V+hbJORsDu 6D1t6NLLcZ7Lu/V7tG8HofNYDCGb+6mRbHTqJpmfxu4uP613LeSlAlws7Qqg5Yw=3D =3D5f3f =2D----END PGP SIGNATURE-----