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

[zephyrbot]

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

The backport to v3.7-branch failed:

Auto-merging subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
[backport-86174-to-v3.7-branch 14095bfbc99] Bluetooth: Controller: Fix active mode extended scanning assert
 Author: Vinayak Kariappa Chettimada <[email protected]>
 Date: Sat Feb 22 06:18:10 2025 +0100
 1 file changed, 4 insertions(+), 3 deletions(-)
Auto-merging subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
Auto-merging subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
[backport-86174-to-v3.7-branch 87b2a3a2132] Bluetooth: Controller: Fix single timer end time capture
 Author: Vinayak Kariappa Chettimada <[email protected]>
 Date: Sat Feb 22 06:18:10 2025 +0100
 2 files changed, 12 insertions(+), 6 deletions(-)
Auto-merging subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c
Auto-merging subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
CONFLICT (content): Merge conflict in subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
Auto-merging subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
CONFLICT (content): Merge conflict in subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
error: could not apply 23d321d679f... Bluetooth: Controller: Fix end time capture be on radio event end
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-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-86174-to-v3.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x ec69ccb681fd57d22b0c1ab08a3dab6083833475~5..ec69ccb681fd57d22b0c1ab08a3dab6083833475
# Push it to GitHub
git push --set-upstream origin backport-86174-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-86174-to-v3.7-branch.