[Backport v3.7-branch] Failed to backport #93791

[github-actions]

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

The backport to v3.7-branch failed:

To https://github.com/zephyrproject-rtos/zephyr.git
 ! [rejected]                backport-93791-to-v3.7-branch -> backport-93791-to-v3.7-branch (non-fast-forward)
error: failed to push some refs to 'https://github.com/zephyrproject-rtos/zephyr.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

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

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

[henrikbrixandersen]

Odd. The branch was created upstream and the patch applied cleanly. I have manually opened #93844 from the upstream branch.