[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/6] lib/tests: Add header for common helpers
Patchwork
patchwork at emeril.freedesktop.org
Fri Feb 15 15:48:25 UTC 2019
== 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".
More information about the igt-dev
mailing list