Switched to a new branch '20240727-upstream-net-20240727-mptcp-backup-signal-v1-0-f50b31604cf1@kernel.org'
Applying: mptcp: sched: check both directions for backup
Using index info to reconstruct a base tree...
M	include/trace/events/mptcp.h
M	net/mptcp/protocol.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/protocol.c
No changes -- Patch already applied.
Applying: mptcp: distinguish rcv vs sent backup flag in requests
Using index info to reconstruct a base tree...
M	net/mptcp/options.c
M	net/mptcp/protocol.h
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/subflow.c
Auto-merging net/mptcp/protocol.h
Auto-merging net/mptcp/options.c
No changes -- Patch already applied.
Applying: mptcp: pm: only set request_bkup flag when sending MP_PRIO
Using index info to reconstruct a base tree...
M	net/mptcp/pm_netlink.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/pm_netlink.c
No changes -- Patch already applied.
Applying: mptcp: mib: count MPJ with backup flag
Using index info to reconstruct a base tree...
M	net/mptcp/mib.c
M	net/mptcp/mib.h
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/subflow.c
No changes -- Patch already applied.
Applying: selftests: mptcp: join: validate backup in MPJ
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
CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/mptcp_join.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 selftests: mptcp: join: validate backup in MPJ
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".