Switched to a new branch '20260803-net-mptcp-misc-fixes-7-2-rc6-v2-0-b8f496d71664@kernel.org'
Applying: mptcp: options: reset DSS fields in case of unexpected size
Using index info to reconstruct a base tree...
M	net/mptcp/options.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/options.c
No changes -- Patch already applied.
Applying: mptcp: avoid combining some incoming suboptions
Using index info to reconstruct a base tree...
M	net/mptcp/options.c
M	net/mptcp/protocol.h
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/protocol.h
Auto-merging net/mptcp/options.c
No changes -- Patch already applied.
Applying: mptcp: remove MPC && MPJ check
Using index info to reconstruct a base tree...
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: mptcp: pm: fix data race in add_addr timer callback
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
No changes -- Patch already applied.
Applying: selftests: mptcp: join: mark tests with data corruption as failed
Using index info to reconstruct a base tree...
M	tools/testing/selftests/net/mptcp/mptcp_join.sh
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/net/mptcp/mptcp_join.sh
No changes -- Patch already applied.
Applying: mptcp: pm: fix memory leak from alloc-during-teardown race
Using index info to reconstruct a base tree...
M	net/mptcp/pm.c
M	net/mptcp/pm_userspace.c
M	net/mptcp/protocol.h
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/protocol.h
Auto-merging net/mptcp/pm_userspace.c
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 0006 mptcp: pm: fix memory leak from alloc-during-teardown race