[Backport v3.5-branch] Failed to backport #71030

[zephyrbot]

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

The backport to v3.5-branch failed:

Auto-merging drivers/bluetooth/hci/rpmsg.c
Auto-merging include/zephyr/drivers/bluetooth/hci_driver.h
CONFLICT (content): Merge conflict in include/zephyr/drivers/bluetooth/hci_driver.h
Auto-merging subsys/bluetooth/host/hci_core.c
CONFLICT (content): Merge conflict in subsys/bluetooth/host/hci_core.c
error: could not apply a64d20f6f08... Bluetooth: host: sched-lock `bt_recv()`
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 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.5-branch v3.5-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.5-branch
# Create a new branch
git switch --create backport-71030-to-v3.5-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x a64d20f6f08bd1293e21da5d11497c82fe10b638
# Push it to GitHub
git push --set-upstream origin backport-71030-to-v3.5-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.5-branch

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

[jhedberg]

Manual backport created: #75362