== Series Details == Series: series starting with [01/15] drm/i915: Hold irq-off for the entire fake lock period (rev4) URL : https://patchwork.freedesktop.org/series/65705/ State : failure == Summary == Applying: drm/i915: Hold irq-off for the entire fake lock period Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_engine_pm.c M drivers/gpu/drm/i915/gt/intel_reset.c M drivers/gpu/drm/i915/gt/intel_timeline.c M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/i915_request.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gem.c No changes -- Patch already applied. Applying: drm/i915/gtt: Preallocate Braswell top-level page directory Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_context.c M drivers/gpu/drm/i915/i915_gem_gtt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 drm/i915/gtt: Preallocate Braswell top-level page directory 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
