[Intel-gfx] ✗ Fi.CI.BUILD: failure for DG1 Lockdep warning fixes
Patchwork
patchwork at emeril.freedesktop.org
Wed Sep 22 09:57:33 UTC 2021
== Series Details ==
Series: DG1 Lockdep warning fixes
URL : https://patchwork.freedesktop.org/series/94932/
State : failure
== Summary ==
Applying: drm/i915/gem: Fix a lockdep warning the __i915_gem_is_lmem() function
Applying: drm/i915/ttm: Fix lockdep warning in __i915_gem_free_object()
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_ttm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915/ttm: Fix lockdep warning in __i915_gem_free_object()
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".
More information about the Intel-gfx
mailing list