== Series Details == Series: kms_vblank: Move tests over from kms_flip. URL : https://patchwork.freedesktop.org/series/36006/ State : failure == Summary == Applying: tests/kms_flip: Remove blt/rcs flip tests. Using index info to reconstruct a base tree... M tests/kms_flip.c Falling back to patching base and 3-way merge... Auto-merging tests/kms_flip.c CONFLICT (content): Merge conflict in tests/kms_flip.c Patch failed at 0001 tests/kms_flip: Remove blt/rcs flip tests. 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
