Switched to a new branch '20240131-upstream-net-20240131-mptcp-ci-issues-v1-0-4c1c11e571ff@kernel.org' Applying: mptcp: fix data re-injection from stale subflow Using index info to reconstruct a base tree... 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: selftests: mptcp: add missing kconfig for NF Filter Using index info to reconstruct a base tree... M tools/testing/selftests/net/mptcp/config Falling back to patching base and 3-way merge... Auto-merging tools/testing/selftests/net/mptcp/config CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/config 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: mptcp: add missing kconfig for NF Filter 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".