✗ Fi.CI.BAT: failure for series starting with [1/9] intel_gt_pm_irq
Patchwork
patchwork at emeril.freedesktop.org
Wed Aug 7 21:43:27 UTC 2019
== Series Details ==
Series: series starting with [1/9] intel_gt_pm_irq
URL : https://patchwork.freedesktop.org/series/64863/
State : failure
== Summary ==
Applying: intel_gt_pm_irq
Applying: intel_gt_irq
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/Makefile
M drivers/gpu/drm/i915/i915_irq.c
M drivers/gpu/drm/i915/i915_irq.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_irq.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.h
Auto-merging drivers/gpu/drm/i915/i915_irq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/i915/Makefile
Patch failed at 0002 intel_gt_irq
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