#119505·zephyr

[Backport v4.4-branch] Failed to backport #115651

Author: github-actions[bot]Created Sep 17, 2026Updated Sep 18, 2026
LabelsBackport

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

The backport to v4.4-branch failed:

Auto-merging subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch backport-115651-to-v4.4-branch
You are currently cherry-picking commit 8b8178b7e50.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

To backport manually, run these commands in your terminal:

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

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

Source: zephyrproject-rtos/zephyr