Repository navigation
[Backport v4.3-branch] Failed to backport #104871 #105038
Description
This issue was created automatically because the backport of #104871 to v4.3-branch failed.
The backport to v4.3-branch failed:
Auto-merging subsys/net/lib/sockets/sockets_tls.c
[backport-104871-to-v4.3-branch 54c00c429d1] net: lib: sockets: tls: Validate addrlen before memcpy
Author: Pieter De Gendt <pieter.degendt@basalte.be>
Date: Wed Mar 4 08:16:53 2026 +0100
1 file changed, 8 insertions(+)
Auto-merging subsys/net/lib/sockets/sockets_tls.c
CONFLICT (content): Merge conflict in subsys/net/lib/sockets/sockets_tls.c
error: could not apply 74732cd6fcb... net: lib: sockets: tls: Use struct net_sockaddr_storage for caches
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-104871-to-v4.3-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 16aded5d1fa838ba93dafc4bc61edfa62a1d2090~3..16aded5d1fa838ba93dafc4bc61edfa62a1d2090
# Push it to GitHub
git push --set-upstream origin backport-104871-to-v4.3-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.3-branchThen, create a pull request where the base branch is v4.3-branch and the compare/head branch is backport-104871-to-v4.3-branch.
Activity