Switched to a new branch '20241119141329.44221-1-carlo.nonato@minervasys.tech'
Applying: xen/common: add cache coloring common code
Using index info to reconstruct a base tree...
M	docs/index.rst
M	xen/common/page_alloc.c
M	xen/include/xen/sched.h
Falling back to patching base and 3-way merge...
Auto-merging xen/include/xen/sched.h
Auto-merging xen/common/page_alloc.c
Auto-merging docs/index.rst
CONFLICT (content): Merge conflict in docs/index.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 xen/common: add cache coloring common code