== Series Details == Series: series starting with [1/9] drm/i915: Rename request reference/unreference to get/put (rev2) URL : https://patchwork.freedesktop.org/series/10081/ State : failure == Summary == Applying: drm/i915: Rename request reference/unreference to get/put Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/i915_gem_request.c M drivers/gpu/drm/i915/i915_gem_request.h M drivers/gpu/drm/i915/i915_gem_userptr.c M drivers/gpu/drm/i915/intel_breadcrumbs.c M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_lrc.c M drivers/gpu/drm/i915/intel_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_gem_request.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_request.c error: Failed to merge in the changes. Patch failed at 0001 drm/i915: Rename request reference/unreference to get/put The copy of the patch that failed is found in: .git/rebase-apply/patch 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
