Switched to a new branch '20241127103425.378289-1-thuth@redhat.com'
Applying: docs/devel/testing/functional: Clarify that we have to use the build folder
Using index info to reconstruct a base tree...
M	docs/devel/testing/functional.rst
Falling back to patching base and 3-way merge...
Auto-merging docs/devel/testing/functional.rst
No changes -- Patch already applied.
Applying: docs: Document that hvf on Arm is supported
Using index info to reconstruct a base tree...
M	docs/about/build-platforms.rst
Falling back to patching base and 3-way merge...
Auto-merging docs/about/build-platforms.rst
No changes -- Patch already applied.
Applying: tests/functional: Fix the running test case causes loongarch64 to hang
Using index info to reconstruct a base tree...
M	tests/functional/test_loongarch64_virt.py
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: meson.build: Refuse XCode versions < v15.0
Using index info to reconstruct a base tree...
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
No changes -- Patch already applied.
Applying: .gitlab-ci.d/cirrus: Remove the wrong CPU and RAM settings from the macOS job
Using index info to reconstruct a base tree...
M	.gitlab-ci.d/cirrus.yml
Falling back to patching base and 3-way merge...
Auto-merging .gitlab-ci.d/cirrus.yml
No changes -- Patch already applied.
Applying: tests/functional: Remove sleep workarounds from sh4 test
Using index info to reconstruct a base tree...
M	tests/functional/test_sh4_tuxrun.py
Falling back to patching base and 3-way merge...
Auto-merging tests/functional/test_sh4_tuxrun.py
CONFLICT (content): Merge conflict in tests/functional/test_sh4_tuxrun.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 tests/functional: Remove sleep workarounds from sh4 test
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".