Switched to a new branch '20180925134144.21741-1-peter.maydell@linaro.org'
Applying: target/arm: Fix cpu_get_tb_cpu_state() for non-SVE CPUs
Using index info to reconstruct a base tree...
M	target/arm/helper.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm/exynos4210: fix Exynos4210 UART support
Using index info to reconstruct a base tree...
M	hw/arm/exynos4210.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm/virt-acpi-build: Add a check for memory-less NUMA nodes
Using index info to reconstruct a base tree...
M	hw/arm/virt-acpi-build.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: MAINTAINERS: Add NRF51 entry
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: arm: Add Nordic Semiconductor nRF51 SoC
.git/rebase-apply/patch:65: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	default-configs/arm-softmmu.mak
M	hw/arm/Makefile.objs
Falling back to patching base and 3-way merge...
Auto-merging hw/arm/Makefile.objs
CONFLICT (content): Merge conflict in hw/arm/Makefile.objs
Patch failed at 0001 arm: Add Nordic Semiconductor nRF51 SoC
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 05/21] arm: Add Nordic Semiconductor nRF51 SoC