[Backport v4.3-branch] Failed to backport #98845

[github-actions]

This issue was created automatically because the backport of #98845 to v4.3-branch failed.

The backport to v4.3-branch failed:

Auto-merging include/zephyr/shell/shell.h
Auto-merging subsys/net/l2/wifi/wifi_shell.c
CONFLICT (content): Merge conflict in subsys/net/l2/wifi/wifi_shell.c
Auto-merging subsys/shell/Kconfig
error: could not apply 22f9ef0a338... sys: getopt: Rename getopt to sys_getopt to avoid conflicts with Posix
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.3-branch v4.3-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.3-branch
# Create a new branch
git switch --create backport-98845-to-v4.3-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x d164f8b55d08aba8084fcd5e0d3bce93263f1aa3~2..d164f8b55d08aba8084fcd5e0d3bce93263f1aa3
# Push it to GitHub
git push --set-upstream origin backport-98845-to-v4.3-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.3-branch

Then, create a pull request where the base branch is v4.3-branch and the compare/head branch is backport-98845-to-v4.3-branch.

[mmahadevan108]

@jukkar any idea how to fix the backport error?

[fabiobaltieri]

@mmahadevan108 did it for you, can you check if it it's correct? #100560

[mmahadevan108]

@fabiobaltieri looks like we duplicated work.

[fabiobaltieri]

@fabiobaltieri looks like we duplicated work.

cool, closing mine down