Switched to a new branch '20180626165658.31394-1-peter.maydell@linaro.org'
Applying: aspeed/smc: fix dummy cycles count when in dual IO mode
Using index info to reconstruct a base tree...
M	hw/ssi/aspeed_smc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: aspeed/smc: fix HW strapping
Using index info to reconstruct a base tree...
M	hw/ssi/aspeed_smc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: aspeed/smc: rename aspeed_smc_flash_send_addr() to aspeed_smc_flash_setup()
Using index info to reconstruct a base tree...
M	hw/ssi/aspeed_smc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: MAINTAINERS: Adopt the Gumstix computers-on-module machines
Using index info to reconstruct a base tree...
M	MAINTAINERS
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: xilinx_spips: Make dma transactions as per dma_burst_size
Using index info to reconstruct a base tree...
M	hw/ssi/xilinx_spips.c
M	include/hw/ssi/xilinx_spips.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: MAINTAINERS: Add ASPEED BMCs
Using index info to reconstruct a base tree...
M	MAINTAINERS
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/input/pckbd: Use qemu_log_mask(GUEST_ERROR) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/input/pckbd.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/input/tsc2005: Use qemu_log_mask(GUEST_ERROR) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/input/tsc2005.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/dma/omap_dma: Use qemu_log_mask(UNIMP) instead of printf
Using index info to reconstruct a base tree...
M	hw/dma/omap_dma.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/dma/omap_dma: Use qemu_log_mask(GUEST_ERROR) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/dma/omap_dma.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/ssi/omap_spi: Use qemu_log_mask(GUEST_ERROR) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/ssi/omap_spi.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/sd/omap_mmc: Use qemu_log_mask(UNIMP) instead of printf
Using index info to reconstruct a base tree...
M	hw/sd/omap_mmc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/i2c/omap_i2c.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm/omap1: Use qemu_log_mask(GUEST_ERROR) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/arm/omap1.c
M	include/hw/arm/omap.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm/omap: Use qemu_log_mask(GUEST_ERROR) instead of fprintf
Using index info to reconstruct a base tree...
M	include/hw/arm/omap.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm/stellaris: Use qemu_log_mask(UNIMP) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/arm/stellaris.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/net/stellaris_enet: Fix a typo
Using index info to reconstruct a base tree...
M	hw/net/stellaris_enet.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error
Using index info to reconstruct a base tree...
M	hw/net/stellaris_enet.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/net/smc91c111: Use qemu_log_mask(GUEST_ERROR) instead of hw_error
Using index info to reconstruct a base tree...
M	hw/net/smc91c111.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/net/smc91c111: Use qemu_log_mask(UNIMP) instead of fprintf
Using index info to reconstruct a base tree...
M	hw/net/smc91c111.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm/stellaris: Fix gptm_write() error message
Using index info to reconstruct a base tree...
M	hw/arm/stellaris.c
Falling back to patching base and 3-way merge...
Auto-merging hw/arm/stellaris.c
CONFLICT (content): Merge conflict in hw/arm/stellaris.c
error: Failed to merge in the changes.
Patch failed at 0001 hw/arm/stellaris: Fix gptm_write() error message
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:
[Qemu-devel] [PULL 21/32] hw/arm/stellaris: Fix gptm_write() error message