[Backport v4.2-branch] Failed to backport #93520 #95758
Description
This issue was created automatically because the backport of #93520 to v4.2-branch failed.
The backport to v4.2-branch failed:
Auto-merging boards/st/b_u585i_iot02a/b_u585i_iot02a-common.dtsi
[backport-93520-to-v4.2-branch 0330115a338] boards: st: b_u585i_iot02a: Extract external partitions
Author: BUDKE Gerson Fernando <[email protected]>
Date: Fri Jul 25 10:34:10 2025 +0200
2 files changed, 12 insertions(+), 10 deletions(-)
Auto-merging doc/releases/migration-guide-4.3.rst
CONFLICT (content): Merge conflict in doc/releases/migration-guide-4.3.rst
CONFLICT (modify/delete): tests/drivers/flash/common/boards/b_u585i_iot02a_stm32u585xx_ns.overlay deleted in f37660293b9 (west.yml: Bump tf-m with stm32 patches) and modified in HEAD. Version HEAD of tests/drivers/flash/common/boards/b_u585i_iot02a_stm32u585xx_ns.overlay left in tree.
Auto-merging west.yml
CONFLICT (content): Merge conflict in west.yml
error: could not apply f37660293b9... west.yml: Bump tf-m with stm32 patches
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 set 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-v4.2-branch v4.2-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.2-branch
# Create a new branch
git switch --create backport-93520-to-v4.2-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x f37660293b946914819b01fcf47e622401315835~2..f37660293b946914819b01fcf47e622401315835
# Push it to GitHub
git push --set-upstream origin backport-93520-to-v4.2-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.2-branchThen, create a pull request where the base branch is v4.2-branch and the compare/head branch is backport-93520-to-v4.2-branch.