Switched to a new branch '20211215104049.2030475-1-peter.maydell@linaro.org'
Applying: hw/intc: clean-up error reporting for failed ITS cmd
Using index info to reconstruct a base tree...
M	hw/intc/arm_gicv3_its.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: docs: aspeed: Add new boards
Using index info to reconstruct a base tree...
M	docs/system/arm/aspeed.rst
Falling back to patching base and 3-way merge...
Auto-merging docs/system/arm/aspeed.rst
No changes -- Patch already applied.
Applying: docs: aspeed: Update OpenBMC image URL
Using index info to reconstruct a base tree...
M	docs/system/arm/aspeed.rst
Falling back to patching base and 3-way merge...
Auto-merging docs/system/arm/aspeed.rst
No changes -- Patch already applied.
Applying: docs: aspeed: Give an example of booting a kernel
Using index info to reconstruct a base tree...
M	docs/system/arm/aspeed.rst
Falling back to patching base and 3-way merge...
Auto-merging docs/system/arm/aspeed.rst
No changes -- Patch already applied.
Applying: docs: aspeed: ADC is now modelled
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: Fix STM32F2XX USART data register readout
Using index info to reconstruct a base tree...
M	hw/char/stm32f2xx_usart.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/intc/arm_gicv3: Extract gicv3_set_gicv3state from arm_gicv3_cpuif.c
Using index info to reconstruct a base tree...
M	hw/intc/arm_gicv3_cpuif.c
M	hw/intc/meson.build
Falling back to patching base and 3-way merge...
Auto-merging hw/intc/meson.build
CONFLICT (content): Merge conflict in hw/intc/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 0001 hw/intc/arm_gicv3: Extract gicv3_set_gicv3state from arm_gicv3_cpuif.c
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 07/33] hw/intc/arm_gicv3: Extract gicv3_set_gicv3state from arm_gicv3_cpuif.c