== Series Details == Series: series starting with [01/29] drm/i915: Mark up ips for RCU protection (rev2) URL : https://patchwork.freedesktop.org/series/59155/ State : failure == Summary == Applying: drm/i915: Mark up ips for RCU protection Applying: drm/i915/guc: Replace WARN with a DRM_ERROR Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_guc_submission.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_guc_submission.c No changes -- Patch already applied. Applying: drm/i915: Use static allocation for i915_globals_park() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_globals.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Consolidate the timeline->barrier Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_context.c M drivers/gpu/drm/i915/i915_request.c M drivers/gpu/drm/i915/i915_timeline.c M drivers/gpu/drm/i915/i915_timeline.h M drivers/gpu/drm/i915/i915_timeline_types.h M drivers/gpu/drm/i915/selftests/mock_timeline.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_request.c No changes -- Patch already applied. Applying: drm/i915: Store the default sseu setup on the engine Applying: drm/i915: Move GraphicsTechnology files under gt/ Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/i915_gem_gtt.c M drivers/gpu/drm/i915/i915_request.c M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_engine_cs.c M drivers/gpu/drm/i915/intel_engine_types.h M drivers/gpu/drm/i915/intel_guc_submission.c M drivers/gpu/drm/i915/intel_lrc.c M drivers/gpu/drm/i915/intel_lrc.h M drivers/gpu/drm/i915/intel_ringbuffer.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_guc_submission.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_request.c Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Auto-merging drivers/gpu/drm/i915/gt/intel_ringbuffer.c Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.h Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c Applying: drm/i915: Only reset the pinned kernel contexts on resume Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_context_types.h M drivers/gpu/drm/i915/gt/intel_engine.h M drivers/gpu/drm/i915/gt/intel_engine_cs.c M drivers/gpu/drm/i915/gt/intel_lrc.c M drivers/gpu/drm/i915/gt/intel_lrc.h M drivers/gpu/drm/i915/gt/intel_ringbuffer.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.h Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_cs.c Auto-merging drivers/gpu/drm/i915/gt/intel_engine.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0007 drm/i915: Only reset the pinned kernel contexts on resume 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
