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.5-branch] Failed to backport #64873 #65025

Closed
zephyrbot opened this issue Nov 9, 2023 · 3 comments
Closed

[Backport v3.5-branch] Failed to backport #64873 #65025

zephyrbot opened this issue Nov 9, 2023 · 3 comments
Assignees
Labels
area: Flash Backport Backport PR and backport failure issues platform: NXP NXP

Comments

@zephyrbot
Copy link
Collaborator

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

The backport to v3.5-branch failed:

Auto-merging drivers/flash/flash_mcux_flexspi_nor.c
CONFLICT (content): Merge conflict in drivers/flash/flash_mcux_flexspi_nor.c
error: could not apply 9dd8f94fd4... drivers: flash: mcux_flexspi_nor: Remove flash reads while programming
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.5-branch v3.5-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.5-branch
# Create a new branch
git switch --create backport-64873-to-v3.5-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 9dd8f94fd47b8b399c230fac2c24e4949cc25b99
# Push it to GitHub
git push --set-upstream origin backport-64873-to-v3.5-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.5-branch

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

@zephyrbot zephyrbot added the Backport Backport PR and backport failure issues label Nov 9, 2023
Copy link

github-actions bot commented Jan 9, 2024

This issue has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this issue will automatically be closed in 14 days. Note, that you can always re-open a closed issue at any time.

@github-actions github-actions bot added the Stale label Jan 9, 2024
@dleach02 dleach02 removed the Stale label Jan 9, 2024
@dleach02
Copy link
Member

dleach02 commented Jan 9, 2024

@danieldegrasse, removing stale bot label

@danieldegrasse
Copy link
Collaborator

Backport was done in #65028, this can be closed

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

No branches or pull requests

4 participants