Switched to a new branch '20210702125954.13247-1-peter.maydell@linaro.org'
Applying: docs/system/arm: Add quanta-q7l1-bmc reference
Using index info to reconstruct a base tree...
M	docs/system/arm/aspeed.rst
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: docs/system/arm: Add quanta-gbs-bmc reference
Using index info to reconstruct a base tree...
M	docs/system/arm/nuvoton.rst
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm: Add basic power management to raspi.
Using index info to reconstruct a base tree...
M	hw/arm/bcm2835_peripherals.c
M	hw/misc/meson.build
M	include/hw/arm/bcm2835_peripherals.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests: Boot and halt a Linux guest on the Raspberry Pi 2 machine
Using index info to reconstruct a base tree...
M	tests/acceptance/boot_linux_console.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/arm: Check NaN mode before silencing NaN
Using index info to reconstruct a base tree...
M	target/arm/helper-a64.c
M	target/arm/vfp_helper.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/gpio/gpio_pwr: use shutdown function for reboot
Using index info to reconstruct a base tree...
M	hw/gpio/gpio_pwr.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/arm: Fix MVE widening/narrowing VLDR/VSTR offset calculation
Using index info to reconstruct a base tree...
M	target/arm/translate-mve.c
Falling back to patching base and 3-way merge...
Auto-merging target/arm/translate-mve.c
No changes -- Patch already applied.
Applying: target/arm: Fix bugs in MVE VRMLALDAVH, VRMLSLDAVH
Using index info to reconstruct a base tree...
M	target/arm/mve_helper.c
Falling back to patching base and 3-way merge...
Auto-merging target/arm/mve_helper.c
No changes -- Patch already applied.
Applying: target/arm: Make asimd_imm_const() public
Using index info to reconstruct a base tree...
M	target/arm/translate-neon.c
M	target/arm/translate.c
M	target/arm/translate.h
Falling back to patching base and 3-way merge...
Auto-merging target/arm/translate.h
CONFLICT (content): Merge conflict in target/arm/translate.h
Auto-merging target/arm/translate.c
CONFLICT (content): Merge conflict in target/arm/translate.c
Auto-merging target/arm/translate-neon.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 target/arm: Make asimd_imm_const() public
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 09/24] target/arm: Make asimd_imm_const() public