[Intel-gfx-trybot] drm/i915: Use fence_write() from rpm resume
jani.saarinen at intel.com
Fri Oct 14 06:31:56 UTC 2016
NEW SINCE: 2016-10-12T11:18:46.661105
Series 13637v1 Series without cover letter
HEAD is now at 14740bb drm-intel-nightly: 2016y-10m-12d-16h-18m-24s UTC integration manifest
Download and apply patch: https://patchwork.freedesktop.org/api/1.0/series/13637/revisions/1/mbox/
Applying: drm/i915: Use fence_write() from rpm resume
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_fence.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: Use fence_write() from rpm resume
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".
Series 13637 revision 1 was fully merged or fully failed: no git log
Build step 'Execute shell' marked build as failure
Jani Saarinen (behalf of trybot)
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Intel-gfx-trybot