LKML Archive on
help / color / mirror / Atom feed
From: Greg KH <>
To: Linus Torvalds <>
Cc: Joe Perches <>, David Miller <>,,
Subject: Re: [GIT PATCH] split up feature-removal-schedule.txt
Date: Tue, 19 Feb 2008 11:07:45 -0800	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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:

to pull from :)


greg k-h

  parent reply	other threads:[~2008-02-19 19:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-13  7:02 Greg KH
2008-02-13  7:04 ` David Miller
2008-02-13  7:22   ` Joe Perches
2008-02-13 16:18     ` Randy Dunlap
2008-02-13 16:59     ` Greg KH
2008-02-13 17:33       ` Joe Perches
2008-02-13 17:47         ` Greg KH
2008-02-13 18:13         ` Linus Torvalds
2008-02-13 18:19           ` Linus Torvalds
2008-02-13 23:38             ` Junio C Hamano
2008-02-13 19:32           ` Andrew Morton
2008-02-19 19:07           ` Greg KH [this message]
2008-02-19 19:34             ` Randy Dunlap
2008-02-19 19:49               ` Greg KH
2008-02-19 20:06                 ` Adrian Bunk
2008-02-13  7:27 ` KOSAKI Motohiro
2008-02-13 10:30 ` [GIT PATCH] " Pekka Pietikainen
2008-02-13 17:00   ` Greg KH
2008-02-13 12:11 ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \
    --subject='Re: [GIT PATCH] split up feature-removal-schedule.txt' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).