Switched to a new branch 'cover.1745840836.git.mprivozn@redhat.com' Applying: util: Add missing G_NO_INLINE annotation Using index info to reconstruct a base tree... M src/util/virfirewalld.h M src/util/virhostcpu.h Falling back to patching base and 3-way merge... Auto-merging src/util/virhostcpu.h CONFLICT (content): Merge conflict in src/util/virhostcpu.h Auto-merging src/util/virfirewalld.h CONFLICT (content): Merge conflict in src/util/virfirewalld.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 util: Add missing G_NO_INLINE annotation 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".