Switched to a new branch 'cover.1759737859.git.pabeni@redhat.com' Applying: mptcp: borrow forward memory from 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 CONFLICT (content): Merge conflict in net/mptcp/protocol.c 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 0001 mptcp: borrow forward memory from subflow