✗ Fi.CI.BUILD: failure for Revert "drm/i915: Track hw reported context runtime"
Patchwork
patchwork at emeril.freedesktop.org
Thu Feb 20 05:11:20 UTC 2020
== Series Details ==
Series: Revert "drm/i915: Track hw reported context runtime"
URL : https://patchwork.freedesktop.org/series/73645/
State : failure
== Summary ==
Applying: Revert "drm/i915: Track hw reported context runtime"
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/selftest_lrc.c
M drivers/gpu/drm/i915/intel_device_info.c
M drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
Auto-merging drivers/gpu/drm/i915/intel_device_info.c
Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c
Patch failed at 0001 Revert "drm/i915: Track hw reported context runtime"
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 Intel-gfx-trybot
mailing list