Switched to a new branch '20260507051639.2784590-1-thuth@redhat.com'
Applying: Remove the deprecated glusterfs block driver
Using index info to reconstruct a base tree...
M	MAINTAINERS
M	block/gluster.c
M	docs/about/removed-features.rst
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
Auto-merging docs/about/removed-features.rst
CONFLICT (modify/delete): block/gluster.c deleted in Remove the deprecated glusterfs block driver and modified in HEAD. Version HEAD of block/gluster.c left in tree.
Auto-merging MAINTAINERS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove the deprecated glusterfs block driver
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".