Switched to a new branch '20251114-net-next-mptcp-sft-count-cache-stats-timeout-v1-0-863cb04e1b7b@kernel.org'
Applying: selftests: mptcp: lib: introduce 'nstat_{init,get}'
Using index info to reconstruct a base tree...
M	tools/testing/selftests/net/mptcp/mptcp_connect.sh
M	tools/testing/selftests/net/mptcp/mptcp_join.sh
M	tools/testing/selftests/net/mptcp/mptcp_lib.sh
M	tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
M	tools/testing/selftests/net/mptcp/simult_flows.sh
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/net/mptcp/simult_flows.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/simult_flows.sh
Auto-merging tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
Auto-merging tools/testing/selftests/net/mptcp/mptcp_lib.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/mptcp_lib.sh
Auto-merging tools/testing/selftests/net/mptcp/mptcp_join.sh
Auto-merging tools/testing/selftests/net/mptcp/mptcp_connect.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/mptcp_connect.sh
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 0001 selftests: mptcp: lib: introduce 'nstat_{init,get}'