This issue was created automatically because the backport of #77969 to v2.7-branch failed.
The backport to v2.7-branch failed:
CONFLICT (modify/delete): subsys/bluetooth/host/classic/avdtp.c deleted in HEAD and modified in 8113ff7e9c6 (bluetooth: AVDTP: Check buffer len before pulling data). Version 8113ff7e9c6 (bluetooth: AVDTP: Check buffer len before pulling data) of subsys/bluetooth/host/classic/avdtp.c left in tree.
error: could not apply 8113ff7e9c6... bluetooth: AVDTP: Check buffer len before pulling data
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-v2.7-branch v2.7-branch
# Navigate to the new working tree
cd .worktrees/backport-v2.7-branch
# Create a new branch
git switch --create backport-77969-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 8113ff7e9c66ed212be90b2b299ffcebb8d4e173
# Push it to GitHub
git push --set-upstream origin backport-77969-to-v2.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v2.7-branch
Then, create a pull request where the base branch is v2.7-branch and the compare/head branch is backport-77969-to-v2.7-branch.
This issue was created automatically because the backport of #77969 to
v2.7-branch
failed.The backport to
v2.7-branch
failed:To backport manually, run these commands in your terminal:
Then, create a pull request where the
base
branch isv2.7-branch
and thecompare
/head
branch isbackport-77969-to-v2.7-branch
.