[Backport v4.0-branch] Failed to backport #85705

[zephyrbot]

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

The backport to v4.0-branch failed:

Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
CONFLICT (content): Merge conflict in subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
Auto-merging subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
error: could not apply 49642efa41c... Bluetooth: Controller: Fix regression in scan aux release
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.0-branch v4.0-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.0-branch
# Create a new branch
git switch --create backport-85705-to-v4.0-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x dcdd3308953ababa0a67382e696982b9f8e2ab86~2..dcdd3308953ababa0a67382e696982b9f8e2ab86
# Push it to GitHub
git push --set-upstream origin backport-85705-to-v4.0-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.0-branch

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

[github-actions]

This issue has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this issue will automatically be closed in 14 days. Note, that you can always re-open a closed issue at any time.