From: Peter Maydell <peter.maydell@linaro.org>
To: Thomas Huth <thuth@redhat.com>
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: Re: [PULL 0/8] qtests and docs
Date: Fri, 10 Jan 2020 11:19:55 +0000 [thread overview]
Message-ID: <CAFEAcA8QODFux83esDryjEe9yYOejR4TA3UoD_vHURJx-REzAA@mail.gmail.com> (raw)
In-Reply-To: <20200107190802.2257-1-thuth@redhat.com>
On Tue, 7 Jan 2020 at 19:08, Thomas Huth <thuth@redhat.com> wrote:
>
> Hi!
>
> The following changes since commit f4d8cf148e43d942ef1202071e0cd66ce40322e0:
>
> Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-01-06' into staging (2020-01-06 17:44:22 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/huth/qemu.git tags/pull-request-2020-01-07
>
> for you to fetch changes up to 2cf30f8ecb8b64cc5ccaf77244570e7def8075a5:
>
> docs: build an index page for the HTML docs (2020-01-07 19:48:30 +0100)
>
> ----------------------------------------------------------------
> * Move qtests into a separate directory
> * Build index.html for docs
> ----------------------------------------------------------------
Conflict in tests/Makefile.include, too big for me to easily
see the right resolution. Can you fix up and resend, please?
thanks
-- PMM
next prev parent reply other threads:[~2020-01-10 11:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 19:07 [PULL 0/8] qtests and docs Thomas Huth
2020-01-07 19:07 ` [PULL 1/8] tests/Makefile: test-char does not need libqtest Thomas Huth
2020-01-07 19:07 ` [PULL 2/8] tests/ptimer: Remove unnecessary inclusion of libqtest.h Thomas Huth
2020-01-07 19:07 ` [PULL 3/8] tests/Makefile: Remove 'tests/' and '$(EXESUF)' from the check-qtest variables Thomas Huth
2020-01-07 19:07 ` [PULL 4/8] tests/Makefile: Separate unit test dependencies from qtest dependencies Thomas Huth
2020-01-07 19:07 ` [PULL 5/8] test: Move qtests to a separate directory Thomas Huth
2020-01-07 19:08 ` [PULL 6/8] tests/Makefile: Move qtest-related settings to a separate Makefile.include Thomas Huth
2020-01-07 19:08 ` [PULL 7/8] tests/libqos: Move the libqos files under tests/qtest/ Thomas Huth
2020-01-07 19:08 ` [PULL 8/8] docs: build an index page for the HTML docs Thomas Huth
2020-01-10 11:19 ` Peter Maydell [this message]
2020-01-12 11:21 ` [PULL 0/8] qtests and docs Thomas Huth
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=CAFEAcA8QODFux83esDryjEe9yYOejR4TA3UoD_vHURJx-REzAA@mail.gmail.com \
--to=peter.maydell@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/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.