== Series Details == Series: series starting with [01/15] drm/i915/display: Squelch kerneldoc warnings URL : https://patchwork.freedesktop.org/series/67970/ State : failure == Summary == Applying: drm/i915/display: Squelch kerneldoc warnings Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915/gem: Distinguish each object type Applying: drm/i915/execlists: Assert tasklet is locked for process_csb() Applying: drm/i915/execlists: Clear semaphore immediately upon ELSP promotion Applying: drm/i915/execlists: Tweak virtual unsubmission Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_lrc.c M drivers/gpu/drm/i915/i915_request.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915/selftests: Check known register values within the context Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/selftest_lrc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0006 drm/i915/selftests: Check known register values within the context 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
