✗ Fi.CI.BAT: failure for HAX drm/i915: Burn raw coal

Patchwork patchwork at emeril.freedesktop.org
Thu May 9 09:24:11 UTC 2019


== Series Details ==

Series: HAX drm/i915: Burn raw coal
URL   : https://patchwork.freedesktop.org/series/60457/
State : failure

== Summary ==

Applying: HAX drm/i915: Burn raw coal
Using index info to reconstruct a base tree...
M	drivers/cpufreq/intel_pstate.c
M	drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/cpufreq/intel_pstate.c
Patch failed at 0001 HAX drm/i915: Burn raw coal
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