LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: joe@perches.com, gregkh@suse.de, davem@davemloft.net,
	linux-kernel@vger.kernel.org
Subject: Re: [GIT PATCH] split up feature-removal-schedule.txt
Date: Wed, 13 Feb 2008 11:32:41 -0800	[thread overview]
Message-ID: <20080213113241.4949e46a.akpm@linux-foundation.org> (raw)
In-Reply-To: <alpine.LFD.1.00.0802131012040.2920@woody.linux-foundation.org>

On Wed, 13 Feb 2008 10:13:42 -0800 (PST)
Linus Torvalds <torvalds@linux-foundation.org> 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.

  parent reply	other threads:[~2008-02-13 19:33 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 [this message]
2008-02-19 19:07           ` Greg KH
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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20080213113241.4949e46a.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=gregkh@suse.de \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [GIT PATCH] split up feature-removal-schedule.txt' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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).