Switched to a new branch '20240607-upstream-net-next-20240607-selftests-mptcp-net-lib-v1-0-e36986faac94@kernel.org'
Applying: selftests: net: lib: ignore possible errors
Using index info to reconstruct a base tree...
M	tools/testing/selftests/net/lib.sh
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/net/lib.sh
No changes -- Patch already applied.
Applying: selftests: net: lib: remove ns from list after clean-up
Using index info to reconstruct a base tree...
M	tools/testing/selftests/net/lib.sh
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/net/lib.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/net/lib.sh
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: net: lib: remove ns from list after clean-up
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".