[Backport v2.7-branch] Failed to backport #82072 #82287
Description
This issue was created automatically because the backport of #82072 to v2.7-branch failed.
The backport to v2.7-branch failed:
Auto-merging subsys/net/lib/dns/resolve.c
[backport-82072-to-v2.7-branch f56e1be703b] net: dns: Check parsing error properly for response
Author: Jukka Rissanen <[email protected]>
Date: Tue Nov 26 15:40:53 2024 +0200
1 file changed, 5 insertions(+)
Auto-merging tests/net/lib/dns_packet/src/main.c
[backport-82072-to-v2.7-branch b40d0c01a5a] tests: net: dns: Add checking of malformed packet
Author: Jukka Rissanen <[email protected]>
Date: Tue Nov 26 15:47:46 2024 +0200
1 file changed, 26 insertions(+), 2 deletions(-)
Auto-merging subsys/net/lib/dns/dns_pack.c
[backport-82072-to-v2.7-branch eb79eead091] net: dns: Validate source buffer length properly
Author: Jukka Rissanen <[email protected]>
Date: Tue Nov 26 16:40:28 2024 +0200
1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging subsys/net/lib/dns/dns_pack.c
[backport-82072-to-v2.7-branch e8ef697ab7f] net: dns: Check DNS answer properly
Author: Jukka Rissanen <[email protected]>
Date: Tue Nov 26 17:48:43 2024 +0200
1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging tests/net/lib/dns_packet/src/main.c
CONFLICT (content): Merge conflict in tests/net/lib/dns_packet/src/main.c
error: could not apply 16669ec4d5f... tests: net: dns: Add test for invalid DNS answer parsing
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-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-82072-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 16669ec4d5f8e0abbfadd06c1c5ec5584005efcd~5..16669ec4d5f8e0abbfadd06c1c5ec5584005efcd
# Push it to GitHub
git push --set-upstream origin backport-82072-to-v2.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v2.7-branchThen, create a pull request where the base branch is v2.7-branch and the compare/head branch is backport-82072-to-v2.7-branch.