[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/3] tools/intel_vbt_decode: Correctly decode v3 GPIO sequence
Patchwork
patchwork at emeril.freedesktop.org
Fri Mar 8 20:44:36 UTC 2019
== Series Details ==
Series: series starting with [i-g-t,1/3] tools/intel_vbt_decode: Correctly decode v3 GPIO sequence
URL : https://patchwork.freedesktop.org/series/57748/
State : failure
== Summary ==
Applying: tools/intel_vbt_decode: Correctly decode v3 GPIO sequence
Using index info to reconstruct a base tree...
M tools/intel_vbt_decode.c
Falling back to patching base and 3-way merge...
Auto-merging tools/intel_vbt_decode.c
CONFLICT (content): Merge conflict in tools/intel_vbt_decode.c
Patch failed at 0001 tools/intel_vbt_decode: Correctly decode v3 GPIO sequence
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