== Series Details ==

Series: series starting with [01/12] dma-buf: Add reference counting to dma_resv
URL   : https://patchwork.freedesktop.org/series/170208/
State : failure

== Summary ==

Error: patch 
https://patchwork.freedesktop.org/api/1.0/series/170208/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
Applying: drm/ttm: Switch LRU cursor to track dma_resv instead of buffer objects
Applying: drm/ttm: switch to ttm_bo_lru_for_each_reserved_guarded for swapout
Applying: drm/ttm: move delete handling into ttm_bo_evict
Applying: drm/ttm: use ttm_bo_lru_for_each_reserved_guarded in evict_all
Applying: drm/ttm: use dma_resv reference in ttm_device_clear_lru_dma_mappings
Applying: drm/ttm: nuke buffer refcounting
Applying: drm/exec: add drm_exec_lock_resv function
Applying: drm/ttm: support using drm_exec during eviction v4
Applying: drm/amdgpu: use drm_exec during BO validation
Using index info to reconstruct a base tree...
M       drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0012 drm/amdgpu: use drm_exec during BO validation
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


Reply via email to