This issue was created automatically because the backport of #107902 to v4.3-branch failed.
The backport to v4.3-branch failed:
Auto-merging tests/net/ipv6/prj.conf
Auto-merging tests/net/ipv6/src/main.c
CONFLICT (content): Merge conflict in tests/net/ipv6/src/main.c
error: could not apply 137d08f8792... tests: net: Add few tests for bad ND packets validation
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-107902-to-v4.3-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 095f064c94b95f9c35e05602e693dc268f0cb865~2..095f064c94b95f9c35e05602e693dc268f0cb865
# Push it to GitHub
git push --set-upstream origin backport-107902-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-107902-to-v4.3-branch.
This issue was created automatically because the backport of #107902 to
v4.3-branchfailed.The backport to
v4.3-branchfailed:To backport manually, run these commands in your terminal:
Then, create a pull request where the
basebranch isv4.3-branchand thecompare/headbranch isbackport-107902-to-v4.3-branch.