Switched to a new branch '20260505-net-mptcp-pm-fixes-7-1-rc3-v1-0-fca8091060a4@kernel.org'
Applying: mptcp: pm: kernel: correctly retransmit ADD_ADDR ID 0
Using index info to reconstruct a base tree...
M	net/mptcp/pm_kernel.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/pm_kernel.c
No changes -- Patch already applied.
Applying: mptcp: pm: ADD_ADDR rtx: allow ID 0
Using index info to reconstruct a base tree...
M	net/mptcp/pm.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/pm.c
CONFLICT (content): Merge conflict in net/mptcp/pm.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 mptcp: pm: ADD_ADDR rtx: allow ID 0