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

2008-02-19 Thread Adrian Bunk
On Tue, Feb 19, 2008 at 11:49:10AM -0800, Greg KH wrote: > On Tue, Feb 19, 2008 at 11:34:22AM -0800, Randy Dunlap wrote: > > 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, Jo

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

2008-02-19 Thread Greg KH
On Tue, Feb 19, 2008 at 11:34:22AM -0800, Randy Dunlap wrote: > 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 pa

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

2008-02-19 Thread Randy Dunlap
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-

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

2008-02-19 Thread Greg KH
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 generall

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

2008-02-13 Thread Junio C Hamano
Linus Torvalds <[EMAIL PROTECTED]> writes: > On Wed, 13 Feb 2008, Linus Torvalds wrote: >> >> 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. > >

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

2008-02-13 Thread Andrew Morton
On Wed, 13 Feb 2008 10:13:42 -0800 (PST) Linus Torvalds <[EMAIL PROTECTED]> 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

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

2008-02-13 Thread Linus Torvalds
On Wed, 13 Feb 2008, Linus Torvalds wrote: > > 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. That, btw, includes "automatic merges" for somethin

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

2008-02-13 Thread Linus Torvalds
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

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

2008-02-13 Thread Greg KH
On Wed, Feb 13, 2008 at 09:33:15AM -0800, Joe Perches wrote: > On Wed, 2008-02-13 at 08:59 -0800, Greg KH wrote: > > > I suggest the same for MAINTAINERS > > Why, is it a merge problem for you? > > $ git-log --pretty=oneline --name-only | \ > grep -vP "[a-fA-F0-9]{40,40}\s" | sort | uniq -c | so

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

2008-02-13 Thread Joe Perches
On Wed, 2008-02-13 at 08:59 -0800, Greg KH wrote: > > I suggest the same for MAINTAINERS > Why, is it a merge problem for you? $ git-log --pretty=oneline --name-only | \ grep -vP "[a-fA-F0-9]{40,40}\s" | sort | uniq -c | sort -rbn 541 MAINTAINERS 506 kernel/sched.c 374 drivers/scsi/l

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

2008-02-13 Thread Greg KH
On Wed, Feb 13, 2008 at 12:30:14PM +0200, Pekka Pietikainen wrote: > On Tue, Feb 12, 2008 at 11:02:15PM -0800, Greg KH wrote: > > This changeset does just that. Turns out that this makes things more > > readable, as it's easier to look at a list of filenames for things than > > picking through a 3

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

2008-02-13 Thread Greg KH
On Tue, Feb 12, 2008 at 11:22:02PM -0800, Joe Perches wrote: > On Tue, 2008-02-12 at 23:04 -0800, David Miller wrote: > > > In the big "linux-next" series of emails, David Miller suggested that > > > the feature-removal-schedule file be broken up into little pieces, as it > > > is causing merge pro

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

2008-02-13 Thread Randy Dunlap
On Tue, 12 Feb 2008 23:22:02 -0800 Joe Perches wrote: > On Tue, 2008-02-12 at 23:04 -0800, David Miller wrote: > > > In the big "linux-next" series of emails, David Miller suggested that > > > the feature-removal-schedule file be broken up into little pieces, as it > > > is causing merge problems

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

2008-02-13 Thread Jeff Garzik
Greg KH wrote: In the big "linux-next" series of emails, David Miller suggested that the feature-removal-schedule file be broken up into little pieces, as it is causing merge problems for different trees. This changeset does just that. Turns out that this makes things more readable, as it's eas

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

2008-02-13 Thread Pekka Pietikainen
On Tue, Feb 12, 2008 at 11:02:15PM -0800, Greg KH wrote: > This changeset does just that. Turns out that this makes things more > readable, as it's easier to look at a list of filenames for things than > picking through a 300 line text file. Hmm.. While you're at it, would it make sense to encode

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

2008-02-12 Thread Joe Perches
On Tue, 2008-02-12 at 23:04 -0800, David Miller wrote: > > In the big "linux-next" series of emails, David Miller suggested that > > the feature-removal-schedule file be broken up into little pieces, as it > > is causing merge problems for different trees. I suggest the same for MAINTAINERS I'd p

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

2008-02-12 Thread David Miller
From: Greg KH <[EMAIL PROTECTED]> Date: Tue, 12 Feb 2008 23:02:15 -0800 > In the big "linux-next" series of emails, David Miller suggested that > the feature-removal-schedule file be broken up into little pieces, as it > is causing merge problems for different trees. > > This changeset does just

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

2008-02-12 Thread Greg KH
In the big "linux-next" series of emails, David Miller suggested that the feature-removal-schedule file be broken up into little pieces, as it is causing merge problems for different trees. This changeset does just that. Turns out that this makes things more readable, as it's easier to look at a