== Series Details == Series: Enable bigjoiner support, second approach. (rev3) URL : https://patchwork.freedesktop.org/series/67590/ State : failure == Summary == Applying: HAX to make DSC work on the icelake test system Applying: drm/i915: Fix for_each_intel_plane_mask definition Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display.h No changes -- Patch already applied. Applying: drm/i915: Introduce and use intel_atomic_crtc_state_for_each_plane_state. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display.h M drivers/gpu/drm/i915/intel_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_pm.c No changes -- Patch already applied. Applying: drm/i915: Remove cursor use of properties for coordinates Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display.c M drivers/gpu/drm/i915/intel_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display.c No changes -- Patch already applied. Applying: drm/i915: Use intel_plane_state in prepare and cleanup plane_fb 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... Auto-merging drivers/gpu/drm/i915/display/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0005 drm/i915: Use intel_plane_state in prepare and cleanup plane_fb 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
