✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915: Extract GT render sleep (rc6) management
Patchwork
patchwork at emeril.freedesktop.org
Fri Sep 13 02:08:44 UTC 2019
== Series Details ==
Series: series starting with [1/2] drm/i915: Extract GT render sleep (rc6) management
URL : https://patchwork.freedesktop.org/series/66599/
State : failure
== Summary ==
Applying: drm/i915: Extract GT render sleep (rc6) management
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_gt_types.h
M drivers/gpu/drm/i915/i915_debugfs.c
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_pmu.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_pmu.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_types.h
Patch failed at 0001 drm/i915: Extract GT render sleep (rc6) management
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