Switched to a new branch '20240903200446.25921-1-philmd@linaro.org'
Applying: hw/sd: Remove legacy sd_set_cb()
Using index info to reconstruct a base tree...
M	hw/sd/sd.c
A	include/hw/sd/sdcard_legacy.h
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): include/hw/sd/sdcard_legacy.h deleted in HEAD and modified in hw/sd: Remove legacy sd_set_cb(). Version hw/sd: Remove legacy sd_set_cb() of include/hw/sd/sdcard_legacy.h left in tree.
Auto-merging hw/sd/sd.c
CONFLICT (content): Merge conflict in hw/sd/sd.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 hw/sd: Remove legacy sd_set_cb()
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".