[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20080212.163107.89231473.davem@davemloft.net>
Date: Tue, 12 Feb 2008 16:31:07 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: torvalds@...ux-foundation.org
Cc: greg@...ah.com, jeff@...zik.org, arjan@...radead.org,
sfr@...b.auug.org.au, linux-kernel@...r.kernel.org,
linux-next@...r.kernel.org, linux-arch@...r.kernel.org,
akpm@...ux-foundation.org
Subject: Re: Announce: Linux-next (Or Andrew's dream :-))
From: Linus Torvalds <torvalds@...ux-foundation.org>
Date: Tue, 12 Feb 2008 10:26:53 -0800 (PST)
> We absolutely MUST NOT have the mindset that "cross-subsystem conflicts
> happen all the time".
Perhaps not, but self-conflicts are the bigger issue for the
networking.
If I (or Jeff or John) push a bug fix to you outside of the merge
window, that blows the entire development tree because at 1500+
changesets I can guarentee you there will be a merge conflict
somewhere.
Near the end of 2.6.24 every bug fix I merged to you created a
conflict with my net-2.6.25 tree. Every time I rebased there
were on the order of 10 to 20 patches with merge conflicts to
resolve.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists