[Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with [CI,1/3] drm/i915: Remove unused i915_gem_active_peek_rcu()
Patchwork
patchwork at emeril.freedesktop.org
Wed Aug 10 05:44:27 UTC 2016
== Series Details ==
Series: series starting with [CI,1/3] drm/i915: Remove unused i915_gem_active_peek_rcu()
URL : https://patchwork.freedesktop.org/series/10826/
State : failure
== Summary ==
Applying: drm/i915: Remove unused i915_gem_active_peek_rcu()
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_gem_request.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_request.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_request.h
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: Remove unused i915_gem_active_peek_rcu()
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
mailing list