== Series Details == Series: series starting with [01/39] drm: Reorder set_property_atomic to avoid returning with an active ww_ctx URL : https://patchwork.freedesktop.org/series/54636/ State : failure == Summary == Applying: drm: Reorder set_property_atomic to avoid returning with an active ww_ctx Applying: drm/i915/selftests: Take a breath during check_partial_mappings() Applying: drm/i915: Return immediately if trylock fails for direct-reclaim Applying: drm/i915/userptr: Avoid struct_mutex recursion for mmu_invalidate_range_start Applying: drm/i915/userptr: Probe vma range before gup Applying: drm/i915: Always try to reset the GPU on takeover Applying: drm/i915: Report the number of closed vma held by each context in debugfs Applying: drm/i915: Track all held rpm wakerefs Applying: drm/i915: Markup paired operations on wakerefs 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_perf.c M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_engine_cs.c M drivers/gpu/drm/i915/intel_uncore.c M drivers/gpu/drm/i915/selftests/i915_gem_context.c M drivers/gpu/drm/i915/selftests/intel_lrc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/intel_lrc.c Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_context.c Auto-merging drivers/gpu/drm/i915/intel_uncore.c Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_perf.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Applying: drm/i915: Syntatic sugar for using intel_runtime_pm Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/intel_uncore.c M drivers/gpu/drm/i915/selftests/i915_gem_context.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_context.c Auto-merging drivers/gpu/drm/i915/intel_uncore.c Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Applying: drm/i915: Markup paired operations on display power domains Applying: drm/i915: Track the wakeref used to initialise display power domains Applying: drm/i915: Combined gt.awake/gt.power wakerefs Applying: drm/i915/dp: Markup pps lock power well Applying: drm/i915: Complain if hsw_get_pipe_config acquires the same power well twice Applying: drm/i915: Mark up Ironlake ips with rpm wakerefs Applying: drm/i915: Serialise concurrent calls to i915_gem_set_wedged() Applying: drm/i915: Differentiate between ggtt->mutex and ppgtt->mutex Applying: drm/i915: Pull all the reset functionality together into i915_reset.c Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_drv.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_engine_cs.c M drivers/gpu/drm/i915/intel_uncore.c M drivers/gpu/drm/i915/selftests/intel_lrc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/intel_lrc.c Auto-merging drivers/gpu/drm/i915/intel_uncore.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_uncore.c Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/i915_debugfs.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0019 drm/i915: Pull all the reset functionality together into i915_reset.c 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
