== Series Details == Series: series starting with [v5] dma-fence: Propagate errors to dma-fence-array container (rev6) URL : https://patchwork.freedesktop.org/series/65027/ State : failure == Summary == Applying: dma-fence: Propagate errors to dma-fence-array container Applying: dma-fence: Report the composite sync_file status Applying: dma-fence: Refactor signaling for manual invocation Applying: dma-fence: Have dma_fence_signal call signal_locked Using index info to reconstruct a base tree... M drivers/dma-buf/dma-fence.c Falling back to patching base and 3-way merge... Auto-merging drivers/dma-buf/dma-fence.c CONFLICT (content): Merge conflict in drivers/dma-buf/dma-fence.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0004 dma-fence: Have dma_fence_signal call signal_locked 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
