[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/3] intel_gpu_top: Update manual page for recent additions
Patchwork
patchwork at emeril.freedesktop.org
Mon Feb 1 13:03:54 UTC 2021
== Series Details ==
Series: series starting with [i-g-t,1/3] intel_gpu_top: Update manual page for recent additions
URL : https://patchwork.freedesktop.org/series/86527/
State : failure
== Summary ==
Applying: intel_gpu_top: Update manual page for recent additions
Using index info to reconstruct a base tree...
M man/intel_gpu_top.rst
Falling back to patching base and 3-way merge...
Auto-merging man/intel_gpu_top.rst
CONFLICT (content): Merge conflict in man/intel_gpu_top.rst
Patch failed at 0001 intel_gpu_top: Update manual page for recent additions
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