Switched to a new branch 'd2ba22d6a36a4f2b952a80712aac2cfe632e8609.1767174251.git.nicola.vetrini@bugseng.com'
Applying: xen: rework deviation to address varargs MISRA violations
Using index info to reconstruct a base tree...
M	automation/eclair_analysis/ECLAIR/deviations.ecl
M	docs/misra/deviations.rst
M	xen/common/libelf/libelf-private.h
M	xen/drivers/char/console.c
Falling back to patching base and 3-way merge...
Auto-merging docs/misra/deviations.rst
CONFLICT (content): Merge conflict in docs/misra/deviations.rst
Auto-merging xen/common/libelf/libelf-private.h
CONFLICT (content): Merge conflict in xen/common/libelf/libelf-private.h
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 set advice.mergeConflict false"
Patch failed at 0001 xen: rework deviation to address varargs MISRA violations