[Intel-gfx] ✗ Ro.CI.BAT: failure for Support for creating/using Stolen memory backed objects (rev15)

Patchwork patchwork at emeril.freedesktop.org
Tue May 31 11:05:33 UTC 2016


== Series Details ==

Series: Support for creating/using Stolen memory backed objects (rev15)
URL   : https://patchwork.freedesktop.org/series/659/
State : failure

== Summary ==

Applying: drm/i915: Add support for mapping an object page by page
Applying: drm/i915: Introduce i915_gem_object_get_dma_address()
Applying: drm/i915: Use insert_page for pwrite_fast
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Patch failed at 0003 drm/i915: Use insert_page for pwrite_fast
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