[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/9] lib/tests: Drop NIH exit status handling (rev4)

[Patchwork]

== 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".