== Series Details == Series: drm/i915: Cleanups around .crtc_enable/disable() (rev2) URL : https://patchwork.freedesktop.org/series/69352/ State : failure == Summary == Applying: drm/i915: Change intel_encoders_<hook>() calling convention Applying: drm/i915: Add intel_crtc_vblank_off() Applying: drm/i915: Move assert_vblank_disabled() into intel_crtc_vblank_on() 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 0003 drm/i915: Move assert_vblank_disabled() into intel_crtc_vblank_on() 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
