Switched to a new branch '20241127154157.83992-1-kuznetsovam@altlinux.org'
Applying: util: Change return type of functions that never fail to void
Using index info to reconstruct a base tree...
M	src/hypervisor/virhostdev.c
M	src/logging/log_daemon.c
M	src/logging/log_daemon_config.c
M	src/logging/log_daemon_config.h
M	src/util/virpci.c
M	src/util/virpci.h
M	src/util/virscsi.c
M	src/util/virscsi.h
M	src/util/virscsivhost.c
M	src/util/virscsivhost.h
M	tests/virscsitest.c
Falling back to patching base and 3-way merge...
Auto-merging src/util/virscsivhost.h
CONFLICT (content): Merge conflict in src/util/virscsivhost.h
Auto-merging src/util/virscsivhost.c
Auto-merging src/util/virscsi.h
CONFLICT (content): Merge conflict in src/util/virscsi.h
Auto-merging src/util/virpci.h
CONFLICT (content): Merge conflict in src/util/virpci.h
Auto-merging src/logging/log_daemon.c
Auto-merging src/hypervisor/virhostdev.c
CONFLICT (content): Merge conflict in src/hypervisor/virhostdev.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 util: Change return type of functions that never fail to void
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".