Re: merging other repos into linux-2.6

[Dave Kleikamp]

On Thu, 2008-10-30 at 12:04 -0700, Linus Torvalds wrote:
> 
> On Wed, 29 Oct 2008, Greg KH wrote:
> > 
> > In working with some of the current out-of-tree drivers, some of them
> > are asking if they could keep their past development history when
> > merging the code into the main kernel tree.
> > 
> > Now normally we don't do this for new drivers, just dropping them in in
> > one big patch, or sometimes multiple patches to get it through email
> > filters.
> 
> I'd suggest you talk to Chris Mason about his btrfs import.
> 
> I'd _like_ for old history to be merged, but quite frankly, bisectability 
> is a fairly big deal, and while we often have cases where a _few_ commits 
> don't build and make bisecting hard, if you import the past development 
> history badly, you can easily end up with _hundreds_ of commits that 
> simply don't build as a kernel at all.

Is bisection really important for a new driver?  I wouldn't expect
anyone to have a config that builds a new driver when bisecting prior to
the point where the driver was merged.  Just to be safe, it would be
easy enough to have the last commit be the one that adds the driver to
Kconfig and the higher-level Makefile.

Shaggy
-- 
David Kleikamp
IBM Linux Technology Center

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/