From: "Alex Bennée" <alex.bennee@linaro.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PULL 0/6] Travis updates
Date: Fri, 05 Feb 2016 17:28:55 +0000 [thread overview]
Message-ID: <874mdnnk14.fsf@linaro.org> (raw)
In-Reply-To: <CAFEAcA9nu-0JPd-ArkiwW63QobRgY2Acbg_cfk7f2nPg+Ge0dg@mail.gmail.com>
-----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.
>
> thanks
> -- PMM
- --
Alex Bennée
-----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=
=5f3f
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2016-02-05 17:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 17:11 [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 1/6] .travis.yml: migrate to container builds Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 2/6] .travis.yml: run make check for all matrix targets Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 3/6] .travis.yml: enable each of the co-routine backends Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 4/6] .travis.yml: enable ccache for the builds Alex Bennée
2016-02-04 17:11 ` [Qemu-devel] [PULL 5/6] .travis.yml: reduce the test matrix a little Alex Bennée
2016-02-04 17:12 ` [Qemu-devel] [PULL 6/6] MAINTAINERS: Add .travis.yml Alex Bennée
2016-02-05 6:25 ` Fam Zheng
2016-02-05 16:26 ` Alex Bennée
2016-02-05 16:28 ` Peter Maydell
2016-02-05 16:27 ` [Qemu-devel] [PULL 0/6] Travis updates Alex Bennée
2016-02-05 16:32 ` Peter Maydell
2016-02-05 16:42 ` Alex Bennée
2016-02-05 17:28 ` Alex Bennée [this message]
2016-02-05 20:19 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874mdnnk14.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.