[Backport v4.1-branch] Failed to backport #98780

[github-actions]

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

The backport to v4.1-branch failed:

Auto-merging include/zephyr/net/icmp.h
CONFLICT (modify/delete): modules/openthread/platform/infra_if.c deleted in HEAD and modified in 587d9e6a4a2 (net: icmp: Verify the address family before calling the callback).  Version 587d9e6a4a2 (net: icmp: Verify the address family before calling the callback) of modules/openthread/platform/infra_if.c left in tree.
Auto-merging subsys/net/ip/icmp.c
Auto-merging subsys/net/ip/icmpv4.c
Auto-merging subsys/net/ip/icmpv6.c
Auto-merging subsys/net/ip/ipv6_mld.c
Auto-merging subsys/net/ip/ipv6_nbr.c
Auto-merging subsys/net/lib/dhcpv4/dhcpv4_server.c
Auto-merging subsys/net/lib/zperf/zperf_shell.c
Auto-merging tests/boards/espressif/ethernet/src/main.c
Auto-merging tests/boards/espressif/wifi/src/main.c
Auto-merging tests/net/checksum_offload/src/main.c
Auto-merging tests/net/icmp/src/main.c
Auto-merging tests/net/icmpv4/src/main.c
Auto-merging tests/net/ipv6_fragment/src/main.c
Auto-merging tests/net/mld/src/main.c
error: could not apply 587d9e6a4a2... net: icmp: Verify the address family before calling the callback
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.1-branch v4.1-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.1-branch
# Create a new branch
git switch --create backport-98780-to-v4.1-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x cc20b72ef2e15e109f9d5f83e49a5dba45eb92ee~3..cc20b72ef2e15e109f9d5f83e49a5dba45eb92ee
# Push it to GitHub
git push --set-upstream origin backport-98780-to-v4.1-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.1-branch

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

[rlubos]

Manual backport: #98984