Switched to a new branch '20241219-bpf-next-net-mptcp-bpf._5Fiter-subflows-v2-0-ae244d3cdbbc@kernel.org' Applying: bpf: Extend bpf_skc_to_mptcp_sock to MPTCP sock Using index info to reconstruct a base tree... M include/net/mptcp.h M net/core/filter.c M net/mptcp/bpf.c Falling back to patching base and 3-way merge... Auto-merging net/mptcp/bpf.c CONFLICT (content): Merge conflict in net/mptcp/bpf.c Auto-merging net/core/filter.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 bpf: Extend bpf_skc_to_mptcp_sock to MPTCP sock 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".