From: H. Peter Anvin Date: Wed, 05 Oct 2005 02:38:53 GMT Subject: Re: What to expect after 0.99.8 Message-ID: <43433CBD.2060603@zytor.com> In-Reply-To: <20051004210706.GA16161@kroah.com> Greg KH wrote: > On Mon, Oct 03, 2005 at 02:08:36PM -0700, H. Peter Anvin wrote: > >>I believe in the medium-to-long term a plugin architecture for merging >>is imperative. It's not even different media types, but some *files* >>have specific merging policies. Think, for example, of pci.ids in the >>Linux kernel tree. > > You mean the file that is now removed from the kernel tree? Sure, > that's a good merge policy :) > *Plonk*... well, the point was that even text files can be structured so that application-specific merge rules can be made to apply. ChangeLogs are another good example. -hpa