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/9] lib/tests: Drop NIH exit status handling (rev4)
Date: Fri, 15 Feb 2019 17:53:38 -0000 [thread overview]
Message-ID: <20190215175338.7914.1126@emeril.freedesktop.org> (raw)
In-Reply-To: <20190213103551.5438-1-daniel.vetter@ffwll.ch>
== Series Details ==
Series: series starting with [i-g-t,1/9] lib/tests: Drop NIH exit status handling (rev4)
URL : https://patchwork.freedesktop.org/series/56600/
State : failure
== Summary ==
Applying: lib/tests: Drop NIH exit status handling
Using index info to reconstruct a base tree...
M lib/tests/igt_assert.c
M lib/tests/igt_segfault.c
M lib/tests/igt_simulation.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: lib/tests: Check that igt_assert forwards correctly through igt_fork
Using index info to reconstruct a base tree...
M lib/tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging lib/tests/igt_fork.c
CONFLICT (add/add): Merge conflict in lib/tests/igt_fork.c
Patch failed at 0002 lib/tests: Check that igt_assert forwards correctly through igt_fork
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 17:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 10:35 [igt-dev] [PATCH i-g-t 1/9] lib/tests: Drop NIH exit status handling Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 2/9] lib/tests: Check that igt_assert forwards correctly through igt_fork Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 3/9] lib/tests: make sure igt_skip in igt_fork is forbidden Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 4/9] lib: Don't leak children in igt_waitchildren_timeout Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 5/9] tests/gem_exec_reuse: Don't leak the hang detector Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 6/9] tests/i915_missed_irq: Don't leave the hang detector hanging Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 7/9] lib: Make sure we leak no child processes Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 8/9] lib: Drop igt_child_done Daniel Vetter
2019-02-13 10:35 ` [igt-dev] [PATCH i-g-t 9/9] lib: Drop IGT_EXIT_TIMEOUT Daniel Vetter
2019-02-13 10:49 ` [igt-dev] [PATCH i-g-t 1/9] lib/tests: Drop NIH exit status handling Chris Wilson
2019-02-13 10:51 ` Chris Wilson
2019-02-13 13:13 ` Daniel Vetter
2019-02-14 9:53 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/9] lib/tests: Drop NIH exit status handling (rev2) Patchwork
2019-02-14 15:00 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] lib/tests: Drop NIH exit status handling (rev3) Patchwork
2019-02-14 20:13 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2019-02-15 9:37 ` Daniel Vetter
2019-02-15 17:53 ` 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=20190215175338.7914.1126@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