Switched to a new branch '20250429111420.1748521-1-berrange@redhat.com'
Applying: storage: stop hardcoding paths for mkfs, mount, umount
Using index info to reconstruct a base tree...
M	meson.build
M	src/storage/storage_backend_fs.c
Falling back to patching base and 3-way merge...
Auto-merging meson.build
No changes -- Patch already applied.
Applying: tests: storage hardcoding paths for mount & vgchange
Using index info to reconstruct a base tree...
M	tests/storagepoolxml2argvtest.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: util: stop hardcoding numad path
Using index info to reconstruct a base tree...
M	meson.build
M	src/util/virnuma.c
Falling back to patching base and 3-way merge...
Auto-merging meson.build
No changes -- Patch already applied.
Applying: util: stop hardcoding bhyve, bhyvectl, bhyveload paths
Using index info to reconstruct a base tree...
M	meson.build
M	src/bhyve/bhyve_command.c
Falling back to patching base and 3-way merge...
Auto-merging meson.build
No changes -- Patch already applied.
Applying: util: stop hardcoding 'ifconfig' path
Using index info to reconstruct a base tree...
M	meson.build
M	src/util/virnetdevip.c
Falling back to patching base and 3-way merge...
Auto-merging src/util/virnetdevip.c
Auto-merging meson.build
No changes -- Patch already applied.
Applying: docs: stop setting vars for docs tools
Using index info to reconstruct a base tree...
M	docs/meson.build
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: build-aux: add missing definition of PERL variable
Using index info to reconstruct a base tree...
M	build-aux/Makefile.in
M	build-aux/meson.build
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: meson: stop setting conf var for required programs
Using index info to reconstruct a base tree...
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
No changes -- Patch already applied.
Applying: util: remove use hardcoded DMIDECODE path
Using index info to reconstruct a base tree...
M	meson.build
M	src/util/virsysinfo.c
Falling back to patching base and 3-way merge...
Auto-merging meson.build
CONFLICT (content): Merge conflict in meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 util: remove use hardcoded DMIDECODE path
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".