From: David Miller <davem@davemloft.net>
To: damian@tvk.rwth-aachen.de
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH 1/2] net-next-2.6: SYN retransmits: Rename threshold variable
Date: Thu, 30 Sep 2010 17:23:37 -0700 (PDT) [thread overview]
Message-ID: <20100930.172337.220062330.davem@davemloft.net> (raw)
In-Reply-To: <1285703144.7187.4.camel@nexus>
Damian please don't do things like this.
When we make a change in net-2.6, that change is going to propagate into
net-next-2.6 the next time I do a merge.
And in this case here, the addition of the "syn_set" boolean argument to
retransmits_timed_out() will happen at that point.
So if anything, you should build on top of the bug fix we put into
net-2.6 instead of duplicating the change.
Adding the same change in two different ways to net-2.6 and net-next-2.6
makes the merge a pain in the neck for me and just makes things look
real confusing.
I'm not applying these two patches, please ask me to merge net-2.6 into
net-next-2.6 and this way you can code them relative to that.
Thanks!
next prev parent reply other threads:[~2010-10-01 0:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-28 19:45 [PATCH 1/2] net-next-2.6: SYN retransmits: Rename threshold variable Damian Lukowski
2010-10-01 0:23 ` David Miller [this message]
2010-10-01 5:22 ` Damian Lukowski
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=20100930.172337.220062330.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=damian@tvk.rwth-aachen.de \
--cc=netdev@vger.kernel.org \
/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).