[Backport v2.7-branch] Failed to backport #230

[stephanosio2]

This issue was created automatically because the backport of #230 to v2.7-branch failed.

The backport to v2.7-branch failed:

CONFLICT (modify/delete): include/zephyr/dsp/basicmath.h deleted in HEAD and modified in 516fad5b2a (rubbish).  Version 516fad5b2a (rubbish) of include/zephyr/dsp/basicmath.h left in tree.
error: could not apply 516fad5b2a... rubbish
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".

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-v2.7-branch v2.7-branch
# Navigate to the new working tree
cd .worktrees/backport-v2.7-branch
# Create a new branch
git switch --create backport-230-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 516fad5b2a700a00f8d9133178c42b20728100e4
# Push it to GitHub
git push --set-upstream origin backport-230-to-v2.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v2.7-branch

Then, create a pull request where the base branch is v2.7-branch and the compare/head branch is backport-230-to-v2.7-branch.