Switched to a new branch '20240703-upstream-bpf-next-20240506-mptcp-subflow-test-v3-0-ebdc2d494049@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...
No changes -- Patch already applied.
Applying: selftests/bpf: Add mptcp pm_nl_ctl link
Using index info to reconstruct a base tree...
M	MAINTAINERS
M	tools/testing/selftests/bpf/Makefile
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/Makefile
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 selftests/bpf: Add mptcp pm_nl_ctl link
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".