lkml.org 
[lkml]   [2008]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PATCH] split up feature-removal-schedule.txt
On Tue, 19 Feb 2008 11:07:45 -0800 Greg KH wrote:

> On Wed, Feb 13, 2008 at 10:13:42AM -0800, Linus Torvalds 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.
>
> Yes, they are easy to handle, but for trees that have to deal with these
> merge issues all the time, they are a pain (hit this one again today.)
> It takes a few minutes to fix up the resolution by hand (using either
> git or quilt), as we do want the new addition to be in the file, so by
> splitting it up, it makes our (the sub-tree maintainers) lives easier.
>
> I've never had a problem with the MAINTAINERS file, as it is pretty big
> and conflicts for me seem to never happen, but the feature-removal file
> does cause problems as it changes over time and things need to get added
> and removed.
>
> Also, there are already remants of a bad-merge in that file, which
> somehow sneaked through.
>
> Yes, these files can not cause kernel bugs, but they are semi-important
> to at least get correct. So I'd ask you to reconsider for the
> feature-removal stuff at the very least.
>
> If you do, the git tree is still there at:
> master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
>
> to pull from :)

Alternatively, since they are easy to fix, I'll volunteer to fix them
(after notified of problems :). (and not split up the file)

---
~Randy


\
 
 \ /
  Last update: 2008-02-19 20:39    [W:0.056 / U:0.256 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site