Switched to a new branch '20251121-net-next-mptcp-memcg-backlog-imp-v1-0-1f34b6c1e0b1@kernel.org'
Applying: net: factor-out _sk_charge() helper
Using index info to reconstruct a base tree...
M	include/net/sock.h
M	net/core/sock.c
M	net/ipv4/af_inet.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: mptcp: factor-out cgroup data inherit helper
Using index info to reconstruct a base tree...
M	net/mptcp/protocol.h
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/subflow.c
CONFLICT (content): Merge conflict in net/mptcp/subflow.c
Auto-merging net/mptcp/protocol.h
CONFLICT (content): Merge conflict in net/mptcp/protocol.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 mptcp: factor-out cgroup data inherit helper