[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100930.172337.220062330.davem@davemloft.net>
Date: Thu, 30 Sep 2010 17:23:37 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: damian@....rwth-aachen.de
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH 1/2] net-next-2.6: SYN retransmits: Rename threshold
variable
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!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists