[Intel-gfx] ✗ Fi.CI.BUILD: failure for overflow: Introduce overflows_type() and castable_to_type()
Patchwork
patchwork at emeril.freedesktop.org
Tue Sep 27 00:27:16 UTC 2022
== Series Details ==
Series: overflow: Introduce overflows_type() and castable_to_type()
URL : https://patchwork.freedesktop.org/series/109076/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/109076/revisions/1/mbox/ not applied
Applying: overflow: Introduce overflows_type() and castable_to_type()
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_utils.h
M include/linux/overflow.h
M lib/overflow_kunit.c
Falling back to patching base and 3-way merge...
Auto-merging lib/overflow_kunit.c
CONFLICT (content): Merge conflict in lib/overflow_kunit.c
Auto-merging include/linux/overflow.h
Auto-merging drivers/gpu/drm/i915/i915_utils.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 overflow: Introduce overflows_type() and castable_to_type()
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