[Backport v2.7-branch] Failed to backport #63742

[zephyrbot]

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

The backport to v2.7-branch failed:

Auto-merging subsys/net/lib/sockets/sockets_net_mgmt.c
[backport-63742-to-v2.7-branch c860ed8097] net: socket: mgmt: Check buf size in recvfrom()
 Author: Jukka Rissanen <[email protected]>
 Date: Tue Oct 10 13:40:08 2023 +0300
 1 file changed, 6 insertions(+), 2 deletions(-)
Auto-merging tests/net/socket/net_mgmt/src/main.c
CONFLICT (content): Merge conflict in tests/net/socket/net_mgmt/src/main.c
error: could not apply 5c6dca3c52... tests: net: sockets: mgmt: Add tests for too long message
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-v2.7-branch v2.7-branch
# Navigate to the new working tree
cd .worktrees/backport-v2.7-branch
# Create a new branch
git switch --create backport-63742-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 5c6dca3c52c0e554331866f69ee52f65d0dfe059~2..5c6dca3c52c0e554331866f69ee52f65d0dfe059
# Push it to GitHub
git push --set-upstream origin backport-63742-to-v2.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v2.7-branch

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

[jukkar]

Backported to 2.7 via #63849 so closing this one.