== Series Details == Series: drm/i915/display: Pass drm_i915_private as param to i915 funcs (rev4) URL : https://patchwork.freedesktop.org/series/113083/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/113083/revisions/4/mbox/ not applied Applying: drm/i915/display: Pass drm_i915_private as param to i915 funcs Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_fbdev.c M drivers/gpu/drm/i915/i915_driver.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_driver.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_driver.c Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/display: Pass drm_i915_private as param to i915 funcs 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".
