-
Notifications
You must be signed in to change notification settings - Fork 8k
Closed
Labels
Description
This issue was created automatically because the backport of #63489 to v2.7-branch
failed.
The backport to v2.7-branch
failed:
Auto-merging drivers/can/can_mcan.c
CONFLICT (content): Merge conflict in drivers/can/can_mcan.c
error: could not apply 6e789e7492... drivers: can: mcan: Move RF0L and RF1L to line 1
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-63489-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 6e789e7492049af5a530302b8d43ac8d60629f84
# Push it to GitHub
git push --set-upstream origin backport-63489-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-63489-to-v2.7-branch
.