== Series Details == Series: series starting with [01/10] dma-buf: Add reference counting to dma_resv URL : https://patchwork.freedesktop.org/series/172874/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/172874/revisions/1/mbox/ not applied Applying: dma-buf: Add reference counting to dma_resv Applying: dma-buf/tests: Convert st-dma-resv tests to use dma_resv_alloc Applying: drm/gem: Add helper for drm_gem_object resv assignment Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_gem_shmem_helper.c M drivers/gpu/drm/drm_prime.c M drivers/gpu/drm/msm/msm_gem.c M drivers/gpu/drm/panthor/panthor_gem.c M drivers/gpu/drm/xe/xe_dma_buf.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_dma_buf.c Auto-merging drivers/gpu/drm/panthor/panthor_gem.c Auto-merging drivers/gpu/drm/msm/msm_gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem.c Auto-merging drivers/gpu/drm/drm_prime.c Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/gem: Add helper for drm_gem_object resv assignment 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". Build failed, no error log produced
