[igt-dev] ✗ Fi.CI.BUILD: failure for Ensure that file descriptors will be closed on exit (rev2)

Patchwork patchwork at emeril.freedesktop.org
Fri Sep 2 12:56:21 UTC 2022


== Series Details ==

Series: Ensure that file descriptors will be closed on exit (rev2)
URL   : https://patchwork.freedesktop.org/series/107997/
State : failure

== Summary ==

Applying: lib: Introduce typed cleanups
Using index info to reconstruct a base tree...
A	lib/igt_types.c
A	lib/igt_types.h
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): lib/igt_types.h deleted in HEAD and modified in lib: Introduce typed cleanups. Version lib: Introduce typed cleanups of lib/igt_types.h left in tree.
CONFLICT (modify/delete): lib/igt_types.c deleted in HEAD and modified in lib: Introduce typed cleanups. Version lib: Introduce typed cleanups of lib/igt_types.c left in tree.
Patch failed at 0001 lib: Introduce typed cleanups
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