== Series Details == Series: igt/gem_exec_schedule: Exercise preemption timeout URL : https://patchwork.freedesktop.org/series/41679/ State : failure == Summary == Applying: igt/gem_exec_schedule: Exercise preemption timeout Using index info to reconstruct a base tree... M tests/gem_exec_schedule.c Falling back to patching base and 3-way merge... Auto-merging tests/gem_exec_schedule.c CONFLICT (content): Merge conflict in tests/gem_exec_schedule.c Patch failed at 0001 igt/gem_exec_schedule: Exercise preemption timeout 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
