From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [git patches] net driver fixes Date: Wed, 20 Feb 2008 14:57:56 -0800 (PST) Message-ID: <20080220.145756.63719432.davem@davemloft.net> References: <20080220212302.GJ30160@fieldses.org> <20080220.134257.41491836.davem@davemloft.net> <20080220222530.GK30160@fieldses.org> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: jeff@garzik.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: bfields@fieldses.org Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:42326 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752546AbYBTW5T (ORCPT ); Wed, 20 Feb 2008 17:57:19 -0500 In-Reply-To: <20080220222530.GK30160@fieldses.org> Sender: netdev-owner@vger.kernel.org List-ID: From: "J. Bruce Fields" Date: Wed, 20 Feb 2008 17:25:30 -0500 > The advantages include earlier warning of merge problems, and avoidance > of duplicate commits--if Jeff's done work that depends on patches that > already upstream, then he either does that work against upstream, or > includes backported patches in the branch he asks you to pull, and you > end up with both the original and the backported patch. Which isn't the > end of the world, but the resulting history seems messier than > necessary. > > Or I guess you could both wait to do this merge until you're ready to > pull in Linus's latest? I do a test pull and build of net-2.6 into Linus's current tree before I send Linus a pull request. If any non-trivial merges are necessary, which hasn't happened yet at all, I would then do a merge into my net-2.6 tree and resolve the conflicts. There is no reason for someone downstream of net-2.6 to do this.