Switched to a new branch '20200123153041.4248-1-peter.maydell@linaro.org'
Applying: target/arm: add PMU feature to cortex-r5 and cortex-r5f
Using index info to reconstruct a base tree...
M	target/arm/cpu.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: target/arm: Fix PAuth sbox functions
Using index info to reconstruct a base tree...
M	target/arm/pauth_helper.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests/tcg/aarch64: Fix compilation parameters for pauth-%
Using index info to reconstruct a base tree...
M	tests/tcg/aarch64/Makefile.target
M	tests/tcg/aarch64/pauth-1.c
M	tests/tcg/aarch64/pauth-2.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests/tcg/aarch64: Add pauth-3
Using index info to reconstruct a base tree...
M	tests/tcg/aarch64/Makefile.softmmu-target
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests/tcg/aarch64: Add pauth-4
Using index info to reconstruct a base tree...
M	tests/tcg/aarch64/Makefile.target
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/acpi: Remove extra indent in ACPI GED hotplug cb
Using index info to reconstruct a base tree...
M	hw/acpi/generic_event_device.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/arm: Use helper function to trigger hotplug handler plug
Using index info to reconstruct a base tree...
M	hw/arm/virt.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: qemu-nbd: Convert invocation documentation to rST
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	MAINTAINERS
M	Makefile
M	docs/interop/conf.py
M	docs/interop/index.rst
M	qemu-doc.texi
A	qemu-nbd.texi
M	qemu-option-trace.texi
Falling back to patching base and 3-way merge...
Auto-merging qemu-doc.texi
CONFLICT (content): Merge conflict in qemu-doc.texi
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Patch failed at 0001 qemu-nbd: Convert invocation documentation to rST
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:
[PULL 08/20] qemu-nbd: Convert invocation documentation to rST