✗ Fi.CI.BAT: failure for series starting with [1/7] drm/i915: Remove waiting & retiring from shrinker paths
Patchwork
patchwork at emeril.freedesktop.org
Fri Jun 21 21:53:27 UTC 2019
== Series Details ==
Series: series starting with [1/7] drm/i915: Remove waiting & retiring from shrinker paths
URL : https://patchwork.freedesktop.org/series/62548/
State : failure
== Summary ==
Applying: drm/i915: Remove waiting & retiring from shrinker paths
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
M drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
M drivers/gpu/drm/i915/gt/intel_gt_types.h
M drivers/gpu/drm/i915/gt/intel_timeline.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_timeline.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
No changes -- Patch already applied.
Applying: drm/i915: Track i915_active using debugobjects
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_active.c
M drivers/gpu/drm/i915/selftests/i915_active.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/i915_active.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_active.c
Auto-merging drivers/gpu/drm/i915/i915_active.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_active.c
Patch failed at 0002 drm/i915: Track i915_active using debugobjects
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