You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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 treecd .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 treecd ../..
# 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.
The text was updated successfully, but these errors were encountered:
This issue was created automatically because the backport of #64399 to
v3.3-branch
failed.The backport to
v3.3-branch
failed:To backport manually, run these commands in your terminal:
Then, create a pull request where the
base
branch isv3.3-branch
and thecompare
/head
branch isbackport-64399-to-v3.3-branch
.The text was updated successfully, but these errors were encountered: