== Series Details == Series: series starting with [1/6] dma-buf: add dynamic DMA-buf handling v11 URL : https://patchwork.freedesktop.org/series/62644/ State : failure == Summary == Applying: dma-buf: add dynamic DMA-buf handling v11 Applying: drm/ttm: remove the backing store if no placement is given Applying: drm/ttm: use the parent resv for ghost objects v2 Applying: drm/amdgpu: use allowed_domains for exported DMA-bufs Applying: drm/amdgpu: add independent DMA-buf export v6 Applying: drm/amdgpu: add independent DMA-buf import v7 Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c M drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h M drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0006 drm/amdgpu: add independent DMA-buf import v7 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
