== Series Details == Series: dma-fence doc polish and small cleanup (rev3) URL : https://patchwork.freedesktop.org/series/42373/ State : failure == Summary == Applying: dma-fence: Some kerneldoc polish for dma-fence.h error: Failed to merge in the changes. Using index info to reconstruct a base tree... M include/linux/dma-fence.h Falling back to patching base and 3-way merge... Auto-merging include/linux/dma-fence.h CONFLICT (content): Merge conflict in include/linux/dma-fence.h Patch failed at 0001 dma-fence: Some kerneldoc polish for dma-fence.h 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