== Series Details == Series: series starting with [01/13] drm/i915: Suppress the "Failed to idle" warning for gem_eio (rev2) URL : https://patchwork.freedesktop.org/series/57742/ State : failure == Summary == Applying: drm/i915: Suppress the "Failed to idle" warning for gem_eio Applying: drm/i915: Introduce the i915_user_extension_method Applying: drm/i915: Introduce a context barrier callback Applying: drm/i915: Create/destroy VM (ppGTT) for use with contexts Applying: drm/i915: Extend CONTEXT_CREATE to set parameters upon construction Using index info to reconstruct a base tree... M include/uapi/drm/i915_drm.h Falling back to patching base and 3-way merge... Auto-merging include/uapi/drm/i915_drm.h CONFLICT (content): Merge conflict in include/uapi/drm/i915_drm.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0005 drm/i915: Extend CONTEXT_CREATE to set parameters upon construction 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
