Switched to a new branch '20200312164459.25924-1-peter.maydell@linaro.org'
Applying: hw/intc/armv7m_nvic: Rebuild hflags on reset
Using index info to reconstruct a base tree...
M	hw/intc/armv7m_nvic.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/arm: Update hflags in trans_CPS_v7m()
Using index info to reconstruct a base tree...
M	target/arm/translate.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/arm: Recalculate hflags correctly after writes to CONTROL
Using index info to reconstruct a base tree...
M	target/arm/helper.c
M	target/arm/helper.h
M	target/arm/translate.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/arm: Fix some comment typos
Using index info to reconstruct a base tree...
M	target/arm/helper.c
M	target/arm/translate.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: aspeed/smc: Add some tracing
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	Makefile.objs
M	hw/ssi/aspeed_smc.c
Falling back to patching base and 3-way merge...
Auto-merging hw/ssi/trace-events
CONFLICT (add/add): Merge conflict in hw/ssi/trace-events
Patch failed at 0001 aspeed/smc: Add some tracing
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Failed to apply patch:
[PULL 05/36] aspeed/smc: Add some tracing