Re: [PATCH 19/62] Driver-Core: devtmpfs - remove EXPERIMENTAL andenable it by default

[Linus Torvalds]

On Wed, 3 Mar 2010, Greg KH wrote:
> 
> I originally did the create from the 2.6.33 release, and then did a
> merge to test that it would be easy for you, but there were a number of
> conflicts due to other trees touching some driver core stuff (that I
> knew was going to happen.)  So I did take a merge point after that had
> happened, and did test it out here on my machines.

Ahh, ok. So at least the base point made sense. I wasn't sure why it was 
that odd point, so I kind of assumed it was just a totally random point. 

> But hey, if you want to have to handle merge conflicts, I'll gladly base
> them on known-common points in the future :)

I'll generally happily do merge conflict resolution, but if there were 
lots of conflicts, then I suspect your choice was fine and probably for 
the best.

Who knows how good a point you picked (we'll see - hopefully the bisect 
worry will never even come up), but even just the "it was very much a 
conscious decision" makes me much happier about it, regardless of 
anything else.

			Linus
--
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/