[Backport v4.1-branch] Failed to backport #97718

[github-actions]

This issue was created automatically because the backport of #97718 to v4.1-branch failed.

The backport to v4.1-branch failed:

CONFLICT (modify/delete): tests/arch/arm/arm_user_stack_test/src/main.c deleted in HEAD and modified in a55053b2164 (tests: fix arch.arm.user.stack test failure).  Version a55053b2164 (tests: fix arch.arm.user.stack test failure) of tests/arch/arm/arm_user_stack_test/src/main.c left in tree.
CONFLICT (modify/delete): tests/arch/arm/arm_user_stack_test/testcase.yaml deleted in HEAD and modified in a55053b2164 (tests: fix arch.arm.user.stack test failure).  Version a55053b2164 (tests: fix arch.arm.user.stack test failure) of tests/arch/arm/arm_user_stack_test/testcase.yaml left in tree.
error: could not apply a55053b2164... tests: fix arch.arm.user.stack test failure
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v4.1-branch v4.1-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.1-branch
# Create a new branch
git switch --create backport-97718-to-v4.1-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x a55053b2164a3f6742ac57d33769ad85288ae56e
# Push it to GitHub
git push --set-upstream origin backport-97718-to-v4.1-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.1-branch

Then, create a pull request where the base branch is v4.1-branch and the compare/head branch is backport-97718-to-v4.1-branch.