From: Patchwork <patchwork@emeril.freedesktop.org>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/6] lib/tests: Add header for common helpers
Date: Fri, 15 Feb 2019 15:48:25 -0000 [thread overview]
Message-ID: <20190215154825.7911.89214@emeril.freedesktop.org> (raw)
In-Reply-To: <20190215095448.13196-1-daniel.vetter@ffwll.ch>
== Series Details ==
Series: series starting with [i-g-t,1/6] lib/tests: Add header for common helpers
URL : https://patchwork.freedesktop.org/series/56715/
State : failure
== Summary ==
Applying: lib/tests: Add header for common helpers
Applying: lib/tests: add internal_assert_wexited/wsignaled
Applying: tests: drop invalid name build checks
Applying: lib/tests: Convert no_exit tests into positive tests
Applying: lib/tests: Add testcase for nonexisting subtest name
Applying: lib/core_auth: mount namespace magic to make the test work everywhere
Using index info to reconstruct a base tree...
M tests/core_auth.c
Falling back to patching base and 3-way merge...
Auto-merging tests/core_auth.c
CONFLICT (content): Merge conflict in tests/core_auth.c
Patch failed at 0006 lib/core_auth: mount namespace magic to make the test work everywhere
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
prev parent reply other threads:[~2019-02-15 15:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 9:54 [igt-dev] [PATCH i-g-t 1/6] lib/tests: Add header for common helpers Daniel Vetter
2019-02-15 9:54 ` [igt-dev] [PATCH i-g-t 2/6] lib/tests: add internal_assert_wexited/wsignaled Daniel Vetter
2019-02-15 9:54 ` [igt-dev] [PATCH i-g-t 3/6] tests: drop invalid name build checks Daniel Vetter
2019-02-15 9:54 ` [igt-dev] [PATCH i-g-t 4/6] lib/tests: Convert no_exit tests into positive tests Daniel Vetter
2019-02-15 9:54 ` [igt-dev] [PATCH i-g-t 5/6] lib/tests: Add testcase for nonexisting subtest name Daniel Vetter
2019-02-15 9:54 ` [igt-dev] [PATCH i-g-t 6/6] lib/core_auth: mount namespace magic to make the test work everywhere Daniel Vetter
2019-02-15 15:48 ` Patchwork [this message]
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=20190215154825.7911.89214@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=igt-dev@lists.freedesktop.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox