Switched to a new branch '20241001024334.834807-1-jamin._5Flin@aspeedtech.com'
Applying: hw/gpio/aspeed: Fix coding style
Using index info to reconstruct a base tree...
M	hw/gpio/aspeed_gpio.c
M	include/hw/gpio/aspeed_gpio.h
Falling back to patching base and 3-way merge...
Auto-merging include/hw/gpio/aspeed_gpio.h
Auto-merging hw/gpio/aspeed_gpio.c
CONFLICT (content): Merge conflict in hw/gpio/aspeed_gpio.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/gpio/aspeed: Fix coding style
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".