[Intel-gfx] ✗ Fi.CI.BAT: failure for kthread: finer-grained lockdep/cross-release completion
Patchwork
patchwork at emeril.freedesktop.org
Thu Dec 7 12:56:45 UTC 2017
== Series Details ==
Series: kthread: finer-grained lockdep/cross-release completion
URL : https://patchwork.freedesktop.org/series/35022/
State : failure
== Summary ==
Applying: kthread: finer-grained lockdep/cross-release completion
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M include/linux/kthread.h
M kernel/kthread.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/kthread.c
CONFLICT (content): Merge conflict in kernel/kthread.c
Patch failed at 0001 kthread: finer-grained lockdep/cross-release completion
The copy of the patch that failed is found in: .git/rebase-apply/patch
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