[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,01/24] i915/gem_exec_latency: Measure the latency of context switching (rev2)

Patchwork
2019-03-26T11:00:29Z

== Series Details ==

Series: series starting with [i-g-t,01/24] i915/gem_exec_latency: Measure the latency of context switching (rev2)
URL : https://patchwork.freedesktop.org/series/58401/
State : failure

== Summary ==

Applying: i915/gem_exec_latency: Measure the latency of context switching
Applying: lib: Add GPU power measurement
Using index info to reconstruct a base tree...
M lib/Makefile.am
M lib/Makefile.sources
M lib/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in lib/igt_gpu_power.h
Auto-merging lib/igt_gpu_power.h
CONFLICT (add/add): Merge conflict in lib/igt_gpu_power.c
Auto-merging lib/igt_gpu_power.c
Patch failed at 0002 lib: Add GPU power measurement
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".