== Series Details == Series: Move all drivers to a common dma-buf locking convention URL : https://patchwork.freedesktop.org/series/108517/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/108517/revisions/1/mbox/ not applied Applying: dma-buf: Add unlocked variant of vmapping functions Applying: dma-buf: Add unlocked variant of attachment-mapping functions Applying: drm/gem: Take reservation lock for vmap/vunmap operations Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_gem.c M include/drm/drm_gem.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_gem.h CONFLICT (content): Merge conflict in include/drm/drm_gem.h Auto-merging drivers/gpu/drm/drm_gem.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: Take reservation lock for vmap/vunmap operations 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".
