-
Notifications
You must be signed in to change notification settings - Fork 8k
Closed as not planned
Labels
Description
This issue was created automatically because the backport of #65546 to v2.7-branch
failed.
The backport to v2.7-branch
failed:
Auto-merging include/syscall_handler.h
CONFLICT (content): Merge conflict in include/syscall_handler.h
error: could not apply 899d4f997e... userspace: Additional checks in K_SYSCALL_MEMORY
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".
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-65546-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 899d4f997e6eebd7e647beeb123dc5deb2821cc9
# Push it to GitHub
git push --set-upstream origin backport-65546-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-65546-to-v2.7-branch
.