[igt-dev] ✗ Fi.CI.BUILD: failure for tests/kms_atomic_transition: Enable Primary Plane on Enabling CRTC.
From: Patchwork <hidden>
Date: 2021-03-23 08:58:33
== Series Details == Series: tests/kms_atomic_transition: Enable Primary Plane on Enabling CRTC. URL : https://patchwork.freedesktop.org/series/88327/ State : failure == Summary == Applying: tests/kms_atomic_transition: Enable Primary Plane on Enabling CRTC. Using index info to reconstruct a base tree... M tests/kms_atomic_transition.c Falling back to patching base and 3-way merge... Auto-merging tests/kms_atomic_transition.c CONFLICT (content): Merge conflict in tests/kms_atomic_transition.c Patch failed at 0001 tests/kms_atomic_transition: Enable Primary Plane on Enabling CRTC. 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". _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev