[Intel-gfx] ✗ Fi.CI.BUILD: failure for dma-buf: fix build due to missing export

Lucas De Marchi lucas.demarchi at intel.com
Sat Jun 5 05:44:54 UTC 2021


This patch is intended for drm-misc, where the issue comes from.

Lucas De Marchi

On Sat, Jun 05, 2021 at 12:30:18AM +0000, Patchwork wrote:
>== Series Details ==
>
>Series: dma-buf: fix build due to missing export
>URL   : https://patchwork.freedesktop.org/series/91045/
>State : failure
>
>== Summary ==
>
>Applying: dma-buf: fix build due to missing export
>Using index info to reconstruct a base tree...
>M	drivers/dma-buf/dma-resv.c
>Falling back to patching base and 3-way merge...
>Auto-merging drivers/dma-buf/dma-resv.c
>CONFLICT (content): Merge conflict in drivers/dma-buf/dma-resv.c
>error: Failed to merge in the changes.
>hint: Use 'git am --show-current-patch=diff' to see the failed patch
>Patch failed at 0001 dma-buf: fix build due to missing export
>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".
>
>


More information about the Intel-gfx mailing list