Switched to a new branch 'cover.1727795334.git.mvogt@redhat.com' Applying: linux-user: add openat2 support in linux-user Using index info to reconstruct a base tree... M linux-user/syscall.c M linux-user/syscall_defs.h Falling back to patching base and 3-way merge... Auto-merging linux-user/syscall_defs.h CONFLICT (content): Merge conflict in linux-user/syscall_defs.h Auto-merging linux-user/syscall.c CONFLICT (content): Merge conflict in linux-user/syscall.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 linux-user: add openat2 support in linux-user 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".