[Backport v3.6-branch] Failed to backport #79830

[zephyrbot]

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

The backport to v3.6-branch failed:

Auto-merging include/zephyr/storage/stream_flash.h
Auto-merging subsys/storage/stream/stream_flash.c
CONFLICT (content): Merge conflict in subsys/storage/stream/stream_flash.c
error: could not apply 8714c172edd... storage/stream_flash: Fix range check in stream_flash_erase_page
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.6-branch v3.6-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.6-branch
# Create a new branch
git switch --create backport-79830-to-v3.6-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 23805301b0046fe531553c0a094c1cef63c62cb0~2..23805301b0046fe531553c0a094c1cef63c62cb0
# Push it to GitHub
git push --set-upstream origin backport-79830-to-v3.6-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.6-branch

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

[de-nordic]

Fixed with #80637