[igt-dev] ✗ Fi.CI.BUILD: failure for Fixing the latency of hrtimer (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Fri Aug 28 08:43:44 UTC 2020
== Series Details ==
Series: Fixing the latency of hrtimer (rev4)
URL : https://patchwork.freedesktop.org/series/81132/
State : failure
== Summary ==
Applying: Fixing the latency of hrtimer
Using index info to reconstruct a base tree...
M tests/i915/perf.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/perf.c
CONFLICT (content): Merge conflict in tests/i915/perf.c
Patch failed at 0001 Fixing the latency of hrtimer
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