On Fri, Jul 05, 2019 at 11:51:57AM +0300, Yonatan Goldschmidt wrote:
> In 9fb9cbb1082d ("[NETFILTER]: Add nf_conntrack subsystem.") the new
> generic nf_conntrack was introduced, and it came to supersede the
> old ip_conntrack.
> This change updates (some) of the obsolete comments referring to old
> file/function names of the ip_conntrack mechanism, as well as removes
> a few self-referencing comments that we shouldn't maintain anymore.
>
> I did not update any comments referring to historical actions (e.g,
> comments like "this file was derived from ..." were left untouched,
> even if the referenced file is no longer here).
Patch does not apply, probably mangled by MUA?
# git am /tmp/yon.goldschmidt
Applying: netfilter: Update obsolete comments referring to ip_conntrack
error: patch failed: include/linux/netfilter/nf_conntrack_h323_asn1.h:1
error: include/linux/netfilter/nf_conntrack_h323_asn1.h: patch does not apply
error: patch failed: net/ipv4/netfilter/ipt_CLUSTERIP.c:416
error: net/ipv4/netfilter/ipt_CLUSTERIP.c: patch does not apply
error: patch failed: net/netfilter/nf_conntrack_core.c:1816
error: net/netfilter/nf_conntrack_core.c: patch does not apply
error: patch failed: net/netfilter/nf_conntrack_h323_asn1.c:1
error: net/netfilter/nf_conntrack_h323_asn1.c: patch does not apply
error: patch failed: net/netfilter/nf_conntrack_proto_icmp.c:215
error: net/netfilter/nf_conntrack_proto_icmp.c: patch does not apply
error: patch failed: net/netfilter/nf_nat_core.c:519
error: net/netfilter/nf_nat_core.c: patch does not apply
Patch failed at 0001 netfilter: Update obsolete comments referring to ip_conntrack
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
