Switched to a new branch '20220711135750.765803-1-peter.maydell@linaro.org'
Applying: target/arm: Handle SME in aarch64_cpu_dump_state
Using index info to reconstruct a base tree...
M	target/arm/cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/arm/cpu.c
No changes -- Patch already applied.
Applying: target/arm: Add infrastructure for disas_sme
Using index info to reconstruct a base tree...
M	target/arm/meson.build
M	target/arm/translate-a64.c
M	target/arm/translate-a64.h
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in target/arm/translate-sme.c
Auto-merging target/arm/translate-sme.c
Auto-merging target/arm/translate-a64.h
Auto-merging target/arm/translate-a64.c
CONFLICT (add/add): Merge conflict in target/arm/sme.decode
Auto-merging target/arm/sme.decode
Auto-merging target/arm/meson.build
CONFLICT (content): Merge conflict in target/arm/meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 target/arm: Add infrastructure for disas_sme
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".