== Series Details == Series: series starting with [01/26] dma-buf: add dma_resv_for_each_fence_unlocked v4 URL : https://patchwork.freedesktop.org/series/94943/ State : failure == Summary == Applying: dma-buf: add dma_resv_for_each_fence_unlocked v4 Applying: dma-buf: add dma_resv_for_each_fence Applying: dma-buf: use new iterator in dma_resv_copy_fences Applying: dma-buf: use new iterator in dma_resv_get_fences v2 Applying: dma-buf: use new iterator in dma_resv_wait_timeout Applying: dma-buf: use new iterator in dma_resv_test_signaled Applying: drm/ttm: use the new iterator in ttm_bo_flush_all_fences Applying: drm/amdgpu: use the new iterator in amdgpu_sync_resv Applying: drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Applying: drm/msm: use new iterator in msm_gem_describe Applying: drm/radeon: use new iterator in radeon_sync_resv Applying: drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Applying: drm/i915: use the new iterator in i915_gem_busy_ioctl Applying: drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Applying: drm/i915: use the new iterator in i915_request_await_object v2 Applying: drm/i915: use new iterator in i915_gem_object_wait_reservation Applying: drm/i915: use new iterator in i915_gem_object_wait_priority Applying: drm/i915: use new iterator in i915_gem_object_last_write_engine Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_object.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_object.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0018 drm/i915: use new iterator in i915_gem_object_last_write_engine 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".
