Skip to content

[Backport v4.2-branch] Failed to backport #99683 #99829

@github-actions

Description

@github-actions

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

The backport to v4.2-branch failed:

Auto-merging subsys/net/lib/dns/dns_pack.c
[backport-99683-to-v4.2-branch 9682349e98c] net: dns: Fix potential buffer overflow when unpacking labels
 Author: Robert Lubos <robert.lubos@nordicsemi.no>
 Date: Wed Nov 19 10:40:28 2025 +0100
 1 file changed, 3 insertions(+), 3 deletions(-)
Auto-merging tests/net/lib/dns_resolve/src/main.c
CONFLICT (content): Merge conflict in tests/net/lib/dns_resolve/src/main.c
error: could not apply 7a9ca8e410d... tests: net: dns_resolve: Add tests for dns_unpack_name()
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-99683-to-v4.2-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 7a9ca8e410d141eb8e6ed2eb5433eec6da5aa679~2..7a9ca8e410d141eb8e6ed2eb5433eec6da5aa679
# Push it to GitHub
git push --set-upstream origin backport-99683-to-v4.2-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.2-branch

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

Metadata

Metadata

Assignees

Labels

BackportBackport PR and backport failure issues

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions