Switched to a new branch '20240827174606.10352-1-farosas@suse.de'
Applying: migration/multifd: Reduce access to p->pages
Using index info to reconstruct a base tree...
M	migration/multifd-qpl.c
M	migration/multifd-uadk.c
M	migration/multifd-zlib.c
M	migration/multifd-zstd.c
M	migration/multifd.c
Falling back to patching base and 3-way merge...
Auto-merging migration/multifd.c
CONFLICT (content): Merge conflict in migration/multifd.c
Auto-merging migration/multifd-zstd.c
CONFLICT (content): Merge conflict in migration/multifd-zstd.c
Auto-merging migration/multifd-zlib.c
CONFLICT (content): Merge conflict in migration/multifd-zlib.c
Auto-merging migration/multifd-uadk.c
CONFLICT (content): Merge conflict in migration/multifd-uadk.c
Auto-merging migration/multifd-qpl.c
CONFLICT (content): Merge conflict in migration/multifd-qpl.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 migration/multifd: Reduce access to p->pages
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".