Messages in this thread | | | Date | Mon, 23 Apr 2001 16:47:20 -0700 | From | Jonathan Lundell <> | Subject | Re: PATCH 2.4.4.3: 3rdparty driver support for kbuild |
| |
At 9:10 AM +1000 4/24/01, Keith Owens wrote: > >I don't see how multiple source trees can be merged automatically with >>100% accuracy. > >I agree, multiple source trees only work 100% for non-overlapping code. >It does not matter how you implement separate source, the moment it >overlaps you need human intervention. That is true for my makefile-2.5 >as well as your Perl method.
Where "non-overlapping" needs to be construed broadly to include "not logically conflicting", and not merely as overlapping diffs. -- /Jonathan Lundell. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |