Switched to a new branch '20250704083723.1410455-1-clg@redhat.com'
Applying: hw/misc/aspeed_sdmc: Skipping dram_init in u-boot for AST2700
Using index info to reconstruct a base tree...
M	hw/misc/aspeed_sdmc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/misc/aspeed_scu: Support the Frequency Counter Control register for AST2700
Using index info to reconstruct a base tree...
M	hw/misc/aspeed_scu.c
Falling back to patching base and 3-way merge...
Auto-merging hw/misc/aspeed_scu.c
No changes -- Patch already applied.
Applying: hw/arm/aspeed: bletchley: update hw strap values
Using index info to reconstruct a base tree...
M	hw/arm/aspeed.c
Falling back to patching base and 3-way merge...
Auto-merging hw/arm/aspeed.c
CONFLICT (content): Merge conflict in hw/arm/aspeed.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 hw/arm/aspeed: bletchley: update hw strap values
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".