On 5 February 2016 at 16:27, Alex Bennée <alex.ben...@linaro.org> wrote: > > Alex Bennée <alex.ben...@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? thanks -- PMM
