On Sat, Aug 22, 2015 at 11:27:56AM +0800, Feng Gao wrote: > Hi Pablo, > > To try to resolve the "git am" issue, so I start the new email > conversation. The attachment is the latest patch file. > > The following is the patch content too. Still not working, I think your MUA is mangling the patch. I can see that tabs are converted to spaces. $ git am /temporary/netfilter-nf_ct_tcp-Remove-the-duplicated-word-in-comment.patch -s Applying: netfilter: nf_ct_tcp: Remove the duplicated word in comment error: patch failed: net/netfilter/nf_conntrack_proto_tcp.c:1088 error: net/netfilter/nf_conntrack_proto_tcp.c: patch does not apply Patch failed at 0001 netfilter: nf_ct_tcp: Remove the duplicated word in comment When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". $ git am --abort $ patch -p1 < /temporary/netfilter_ct_tcp-Remove-the-duplicated-word-in-comment.patch patching file net/netfilter/nf_conntrack_proto_tcp.c Hunk #1 FAILED at 1088. 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/nf_conntrack_proto_tcp.c.rej > - /* Set ASSURED if we see see valid ack in ESTABLISHED > - after SYN_RECV or a valid answer for a picked up > - connection. */ > + /* Set ASSURED if we see valid ack in ESTABLISHED after > + * SYN_RECV or a valid answer for a picked up connection. > + */ ^^^^^^^^ I can see space here instead of tab. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
