Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport v3.3-branch] Failed to backport #64399 #64414

Closed
zephyrbot opened this issue Oct 26, 2023 · 0 comments · Fixed by #64427
Closed

[Backport v3.3-branch] Failed to backport #64399 #64414

zephyrbot opened this issue Oct 26, 2023 · 0 comments · Fixed by #64427
Assignees
Labels
area: CAN Backport Backport PR and backport failure issues

Comments

@zephyrbot
Copy link
Collaborator

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

The backport to v3.3-branch failed:

Auto-merging drivers/can/can_loopback.c
Auto-merging drivers/can/can_mcan.c
CONFLICT (content): Merge conflict in drivers/can/can_mcan.c
Auto-merging drivers/can/can_mcp2515.c
Auto-merging drivers/can/can_mcux_flexcan.c
Auto-merging drivers/can/can_native_posix_linux.c
CONFLICT (modify/delete): drivers/can/can_nxp_s32_canxl.c deleted in HEAD and modified in 6c5400d2e1 (drivers: can: be consistent in filter_id checks when removing rx filters).  Version 6c5400d2e1 (drivers: can: be consistent in filter_id checks when removing rx filters) of drivers/can/can_nxp_s32_canxl.c left in tree.
Auto-merging drivers/can/can_rcar.c
Auto-merging drivers/can/can_stm32.c
error: could not apply 6c5400d2e1... drivers: can: be consistent in filter_id checks when removing rx filters
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-v3.3-branch v3.3-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.3-branch
# Create a new branch
git switch --create backport-64399-to-v3.3-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 6c5400d2e1dbc6fc278dad8cce396208fbecc59a
# Push it to GitHub
git push --set-upstream origin backport-64399-to-v3.3-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.3-branch

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: CAN Backport Backport PR and backport failure issues
Projects
None yet
2 participants