✗ Fi.CI.BAT: failure for series starting with [01/24] drm/i915: Track all held rpm wakerefs

Patchwork patchwork at emeril.freedesktop.org
Mon Jan 14 12:35:03 UTC 2019


== Series Details ==

Series: series starting with [01/24] drm/i915: Track all held rpm wakerefs
URL   : https://patchwork.freedesktop.org/series/55153/
State : failure

== Summary ==

Applying: drm/i915: Markup paired operations on wakerefs
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_debugfs.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/intel_drv.h
M	drivers/gpu/drm/i915/intel_runtime_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Patch failed at 0001 drm/i915: Markup paired operations on wakerefs
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