-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Open
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues
Milestone
Description
This issue was created automatically because the backport of #94080 to v3.7-branch failed.
The backport to v3.7-branch failed:
Auto-merging include/zephyr/bluetooth/l2cap.h
Auto-merging subsys/bluetooth/host/l2cap.c
CONFLICT (content): Merge conflict in subsys/bluetooth/host/l2cap.c
error: could not apply f231c5f0708... Bluetooth: Host: Add req/rsp l2cap validation
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-94080-to-v3.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x f231c5f0708bd6eb382e45e5b6b071e503389f75
# Push it to GitHub
git push --set-upstream origin backport-94080-to-v3.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.7-branchThen, create a pull request where the base branch is v3.7-branch and the compare/head branch is backport-94080-to-v3.7-branch.
Metadata
Metadata
Assignees
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues