== Series Details == Series: Move all drivers to a common dma-buf locking convention URL : https://patchwork.freedesktop.org/series/106980/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/106980/revisions/1/mbox/ not applied Applying: dma-buf: Add _unlocked postfix to function names Using index info to reconstruct a base tree... M drivers/dma-buf/dma-buf.c M drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c M drivers/gpu/drm/armada/armada_gem.c A drivers/gpu/drm/drm_gem_cma_helper.c M drivers/gpu/drm/drm_gem_shmem_helper.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c Auto-merging drivers/gpu/drm/drm_gem_dma_helper.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem_dma_helper.c Auto-merging drivers/gpu/drm/armada/armada_gem.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Auto-merging drivers/dma-buf/dma-buf.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: Add _unlocked postfix to function names 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".
