✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/pmu: Do not assume fixed hrtimer period

Patchwork patchwork at emeril.freedesktop.org
Tue Jun 5 19:49:05 UTC 2018


== Series Details ==

Series: series starting with [1/2] drm/i915/pmu: Do not assume fixed hrtimer period
URL   : https://patchwork.freedesktop.org/series/44273/
State : failure

== Summary ==

Applying: drm/i915/pmu: Do not assume fixed hrtimer period
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_pmu.c
M	drivers/gpu/drm/i915/i915_pmu.h
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
Patch failed at 0001 drm/i915/pmu: Do not assume fixed hrtimer period
The copy of the patch that failed is found in: .git/rebase-apply/patch
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