From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH] netfilter: Update obsolete comments referring to ip_conntrack
Date: Fri, 5 Jul 2019 22:48:36 +0200 [thread overview]
Message-ID: <20190705204836.wfosjpa5q7thwohz@salvia> (raw)
In-Reply-To: <20190705085156.GA14117@jong.localdomain>
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".
next prev parent reply other threads:[~2019-07-05 20:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 8:51 [PATCH] netfilter: Update obsolete comments referring to ip_conntrack Yonatan Goldschmidt
2019-07-05 20:48 ` Pablo Neira Ayuso [this message]
2019-07-06 22:28 ` Yonatan Goldschmidt
2019-07-06 22:36 ` Florian Westphal
2019-07-08 10:07 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190705204836.wfosjpa5q7thwohz@salvia \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=yon.goldschmidt@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).