Re: [GIT PATCH] split up feature-removal-schedule.txt

[Andrew Morton]

On Wed, 13 Feb 2008 10:13:42 -0800 (PST)
Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

> 
> 
> On Wed, 13 Feb 2008, Joe Perches wrote:
> > 
> > MAINTAINERS is the most frequently patched file
> 
> Almost all of them merge perfectly, with no problems what-so-ever. And the 
> merge conflicts, when they happen, are generally really trivial, and never 
> cause any subtle run-time bugs even if they were to happen.
> 
> So in that sense, I think both MAINTAINERS and the deprecation schedule 
> are totally uninteresting. Yes, they have merge conflicts. But those merge 
> conflicts are really really easy to handle.
> 

yup.  I'll often get conflicts and rejects in those files from the git
trees which I don't even bother fixing.
--
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/