✗ Fi.CI.BUILD: failure for IGT documentation refactoring
Patchwork
patchwork at emeril.freedesktop.org
Thu Feb 29 16:34:07 UTC 2024
== Series Details ==
Series: IGT documentation refactoring
URL : https://patchwork.freedesktop.org/series/130555/
State : failure
== Summary ==
Applying: Documentation refactoring part 1
Using index info to reconstruct a base tree...
M tests/device_reset.c
M tests/intel/api_intel_bb.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/api_intel_bb.c
Auto-merging tests/device_reset.c
CONFLICT (content): Merge conflict in tests/device_reset.c
Patch failed at 0001 Documentation refactoring part 1
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