Switched to a new branch '20240730221957.34533-1-philmd@linaro.org'
Applying: docs: add test for firmware.json QAPI
Using index info to reconstruct a base tree...
M	docs/meson.build
Falling back to patching base and 3-way merge...
Auto-merging docs/meson.build
No changes -- Patch already applied.
Applying: docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str
Using index info to reconstruct a base tree...
M	docs/sphinx/depfile.py
Falling back to patching base and 3-way merge...
Auto-merging docs/sphinx/depfile.py
No changes -- Patch already applied.
Applying: tests/avocado: mips: fallback to HTTP given certificate expiration
Using index info to reconstruct a base tree...
A	tests/avocado/boot_linux_console.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/avocado/boot_linux_console.py deleted in HEAD and modified in tests/avocado: mips: fallback to HTTP given certificate expiration. Version tests/avocado: mips: fallback to HTTP given certificate expiration of tests/avocado/boot_linux_console.py left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 tests/avocado: mips: fallback to HTTP given certificate expiration
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".