[Backport v3.7-branch] Failed to backport #80261

[zephyrbot]

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

The backport to v3.7-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 6bc73df06b8... drivers: flash: flash_mcux_flexspi: add support for W25Q512JV
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".
hint: Disable this message with "git config advice.mergeConflict false"

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.7-branch v3.7-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.7-branch
# Create a new branch
git switch --create backport-80261-to-v3.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 23d253727c7f68ba78e7206d0b7d47aa6cc75352~2..23d253727c7f68ba78e7206d0b7d47aa6cc75352
# Push it to GitHub
git push --set-upstream origin backport-80261-to-v3.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.7-branch

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

[danieldegrasse]

Fixed by #80594