[Intel-gfx] ✗ Fi.CI.BUILD: failure for Return head pages from find_*_entry (rev4)

Patchwork patchwork at emeril.freedesktop.org
Mon Sep 14 18:37:50 UTC 2020


== Series Details ==

Series: Return head pages from find_*_entry (rev4)
URL   : https://patchwork.freedesktop.org/series/81557/
State : failure

== Summary ==

Applying: mm: Factor find_get_incore_page out of mincore_page
Applying: mm: Use find_get_incore_page in memcontrol
Applying: mm: Optimise madvise WILLNEED
Using index info to reconstruct a base tree...
M	mm/madvise.c
Falling back to patching base and 3-way merge...
Auto-merging mm/madvise.c
CONFLICT (content): Merge conflict in mm/madvise.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 mm: Optimise madvise WILLNEED
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