Switched to a new branch '20240911-upstream-bpf-next-20240506-mptcp-subflow-test-v6-0-7872294c466b@kernel.org'
Applying: selftests/bpf: Add mptcp subflow example
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in tools/testing/selftests/bpf/progs/mptcp_subflow.c
Auto-merging tools/testing/selftests/bpf/progs/mptcp_subflow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 selftests/bpf: Add mptcp subflow example
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".