== Series Details == Series: series starting with [1/6] dma-buf: remove shared fence staging in reservation object URL : https://patchwork.freedesktop.org/series/47948/ State : failure == Summary == Applying: dma-buf: remove shared fence staging in reservation object Using index info to reconstruct a base tree... M drivers/dma-buf/reservation.c Falling back to patching base and 3-way merge... Auto-merging drivers/dma-buf/reservation.c CONFLICT (content): Merge conflict in drivers/dma-buf/reservation.c error: Failed to merge in the changes. Patch failed at 0001 dma-buf: remove shared fence staging in reservation object Use 'git am --show-current-patch' to see the failed 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
