Skip to contentSkip to conversation

MAINTAINERS: sort and merge P and M fields

PATCHSCRIPT New Uwe Kleine-König 5 participants 19 messages Sep 8, 2008 – Sep 22, 2008

lore
Share & tools
lore
#0 lore raw

Hello Linus,

some time ago I sent two patch scripts to LKML that changed the MAINTAINERS file. One fixed the alphabetic ordering and another merged the P and M fields to ease copy'n'paste.

See

	http://thread.gmane.org/gmane.linux.kernel/702194

for the details.

I still like both changes, but I think it's not sensible to send you the resulting patches because MAINTAINERS changes frequently.

If you like these two changes, too, I would be happy if you run the attached script in your working copy. It simply wraps the two scripts and commits the changes.

Note that you need to apply the patch below before the scripts will work. And note further that the script expects a clean working copy to start with, because it uses git commit -a.

Best regards
Uwe

---->8----
From: Uwe Kleine-König <[email protected]>
Subject: [PATCH] Fix format of MAINTAINERS

... one entry lacked a colon which broke one of my scripts.

---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
index af27945..b3e92fb 100644
@@ -1593,7 +1593,7 @@ S:	Supported
 EMBEDDED LINUX
 P:	Paul Gortmaker
 M:	[email protected]
-P	David Woodhouse
+P:	David Woodhouse
 M:	[email protected]
 L:	[email protected]
 S:	Maintained
Signature · 1 line
1.5.6.5

#! /usr/bin/env python
# vim: set fileencoding=utf-8 :

import locale
import os

locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')

author = 'Uwe Kleine-König'
author_email = '[email protected]'

script_sort = r"""#! /usr/bin/env python

import locale
import re
import sys
import tempfile

locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')

re_start = re.compile('P:')
re_topic = re.compile('[0-9a-zA-Z][^:]')
# F is undefined but used
re_field = re.compile('[PMLWTSF]:')
re_empty = re.compile('\s*$')

prologue = True
current_topic = None
topic = dict()
fixed_maintainers = tempfile.TemporaryFile()

for line in open('MAINTAINERS'):
if prologue:
print >> fixed_maintainers, line,
mo = re_start.match(line)
if mo:
prologue = False

continue

mo = re_topic.match(line)
if mo:
current_topic = line
if topic.has_key(current_topic):
sys.exit(1)
topic[current_topic] = list()
continue

elif current_topic is None:
# rest of prologue
print >> fixed_maintainers, line,

continue

assert not current_topic is None

mo = re_field.match(line)
if mo:
topic[current_topic].append(line)

else:
mo = re_empty.match(line)
if not mo:
print >> sys.stderr, 'tralala', current_topic, repr(line) sys.exit(1)

first = True

the_rest = 'THE REST\n'
have_the_rest = False

# sort case insensitive
for t, body in sorted(topic.iteritems(), key=lambda i: i[0].upper()):
    if t == the_rest:
        have_the_rest = True
        continue

if first:
first = False
else:
print >> fixed_maintainers

print >> fixed_maintainers, t,
for line in body:
print >> fixed_maintainers, line,

if have_the_rest:
print >> fixed_maintainers

print >> fixed_maintainers, the_rest,
for line in topic[the_rest]:
print >> fixed_maintainers, line,

fixed_maintainers.seek(0)

maintainers = open('MAINTAINERS', 'w')
for line in fixed_maintainers:
print >> maintainers, line,
"""

script_mergePM = r"""#! /usr/bin/env python

import locale
import re
import sys
import tempfile

locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')

re_person = re.compile('P:(\s*)(.*)')
re_mail = re.compile('M:\s*(.*)')

fixed_maintainers = tempfile.TemporaryFile()

current_person = None
current_person_used = False

for lineno, line in enumerate(open('MAINTAINERS')):
mo = re_person.match(line)
if mo:
if current_person and not current_person_used:
print >> fixed_maintainers, 'P:%s%s' % (current_person_intend, current_person)

current_person = mo.group(2)
current_person_intend = mo.group(1)
current_person_used = False
continue

mo = re_mail.match(line)
if mo:
if current_person is None:
print 'mail without person at line %d' % (lineno + 1) sys.exit(1)

mail = mo.group(1)

if mail == 'Mail patches to':
mail = '[email protected]'

print >> fixed_maintainers, 'P:%s%s <%s>' % (current_person_intend, current_person, mail) current_person_used = True

else:
if current_person and not current_person_used:
# either there is no mail address or the entry is already correct print >> fixed_maintainers, 'P:%s%s' % (current_person_intend, current_person)

current_person = None
print >> fixed_maintainers, line,

fixed_maintainers.seek(0)

maintainers = open('MAINTAINERS', 'w')
for line in fixed_maintainers:
print >> maintainers, line,
"""

def tabintend(s):
lines = s.split('\n')
indented_lines = ('\t%s' % l for l in lines)
return '\n'.join(indented_lines)

intended_script_sort = tabintend(script_sort) intended_script_mergePM = tabintend(script_mergePM)

exec script_sort in dict(globals())

os.system('git commit --author="%(author)s <%(author_email)s>" -a -m "MAINTAINERS: fix alphabetic ordering\n\nThis change was done using the following Python script:\n\n%(intended_script_sort)s\n\nSigned-off-by: %(author)s <%(author_email)s>\n"' % locals())

exec script_mergePM in dict(globals())

os.system('git commit --author="%(author)s <%(author_email)s>" -a -m "MAINTAINERS: merge P and M fields to ease copy\'n\'paste\n\nThis was suggested by Sam Ravnborg and done using the following\nPython script:\n\n%(intended_script_mergePM)s\n\nSigned-off-by: %(author)s <%(author_email)s>\n"' % locals())

#1 lore raw
Quoted 13 lines · On Tue, 9 Sep 2008 00:11:39 +0200 Uwe Kleine-König wrote:

Hello Linus,

some time ago I sent two patch scripts to LKML that changed the MAINTAINERS file. One fixed the alphabetic ordering and another merged the P and M fields to ease copy'n'paste.

See

	http://thread.gmane.org/gmane.linux.kernel/702194

for the details.

I still like both changes, but I think it's not sensible to send you the resulting patches because MAINTAINERS changes frequently.

Quoted 7 lines

If you like these two changes, too, I would be happy if you run the attached script in your working copy. It simply wraps the two scripts and commits the changes.

Note that you need to apply the patch below before the scripts will work. And note further that the script expects a clean working copy to start with, because it uses git commit -a.

I like it. Thanks.

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

#2 lore raw
In reply to Uwe Kleine-König

Hello Linus,

Quoted 2 lines · Uwe Kleine-König

Note that you need to apply the patch below before the scripts will work.

I see you applied this patch but not the two patches from my script. Does this mean you consider this is not the right time for the latter two patches? If so should I trigger you again later? When? Or didn't you find time to look at the script?

thanks and best regards
Uwe

#3 lore raw
In reply to Uwe Kleine-König
Quoted 7 lines · Uwe Kleine-König

some time ago I sent two patch scripts to LKML that changed the MAINTAINERS file. One fixed the alphabetic ordering and another merged the P and M fields to ease copy'n'paste.

See

	http://thread.gmane.org/gmane.linux.kernel/702194

for the details.

If the MAINTAINERS file in the repository mentioned in that thread
(http://www.modarm9.com/git/people/ukleinek/linux-2.6.git?a=shortlog;h=refs/heads/maintainers) is the result of the current script, you need to clean up some of the results of merging the P and M fields (false positives not removed):

$ grep "P:.*," MAINTAINERS 
P:	Cirrus Logic Corporation (kernel 2.2 driver) <Cirrus Logic
Corporation, Thomas Woller <[email protected]>>
P:	Hans Verkuil, Andy Walls <[email protected], [email protected]>
P:	Digi International, Inc <[email protected]>
P:	Mike Halcrow, Phillip Hellewell <[email protected],
[email protected]>
P:	Christopher Hoover <[email protected], [email protected]>
P:	Stephen Tweedie, Andrew Morton <[email protected],
[email protected], [email protected]>
P:	Stephen Tweedie, Andrew Morton <[email protected],
[email protected], [email protected]>
P:	Kristian Hoegsberg, Stefan Richter <[email protected],
[email protected]>
P:	Jean Delvare (PC drivers, core) <[email protected]>
P:	Stephen Tweedie, Andrew Morton <[email protected],
[email protected]>
P:	Wong Hoi Sing, Edison <[email protected]>
P:	Hung Hing Lun, Mike <[email protected]>
P:	Carlos Aguiar, Anderson Briglia and Syed Khasim
<[email protected] (subscribers only)>

Regards,

Paul Bolle

#4 lore raw

Hi Paul,

Quoted 11 lines · Paul Bolle
Quoted 7 lines · Uwe Kleine-König

some time ago I sent two patch scripts to LKML that changed the MAINTAINERS file. One fixed the alphabetic ordering and another merged the P and M fields to ease copy'n'paste.

See

	http://thread.gmane.org/gmane.linux.kernel/702194

for the details.

If the MAINTAINERS file in the repository mentioned in that thread
(http://www.modarm9.com/git/people/ukleinek/linux-2.6.git?a=shortlog;h=refs/heads/maintainers) is the result of the current script, you need to clean up some of the results of merging the P and M fields (false positives not removed):

No, it's not current, but your concerns are valid anyhow.

I updated my script to handle some of these entries, and I fixed the others (and some more) by extra patches.

Now the URL above shows the current result again.

I will post the extra patches as a reply to this mail.

Thanks,
Uwe

Signature · 3 lines
Uwe Kleine-König

http://www.google.com/search?q=12+divided+by+3
#5 lore raw

PATCH 1/1 Reformat MAINTAINERS entry for Cirrus CS4280/CS461X sound driver

replace the (anyhow obvious) company name by Thomas' realname and remove Nils' realname from his M field which is already in the corresponding P field.

The old entry broke my script to merge the P and M fields.

Cc Thomas Woller <[email protected]>
Cc Nils Faerber <[email protected]>
---
 MAINTAINERS |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
MAINTAINERS +3 -3
index 186be3b..fdea0d3 100644
@@ -1113,10 +1113,10 @@ L:	[email protected]
 S:	Supported
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
-P:	Cirrus Logic Corporation (kernel 2.2 driver)
-M:	Cirrus Logic Corporation, Thomas Woller <[email protected]>
+P:	Thomas Woller (kernel 2.2 driver)
+M:	[email protected]
 P:	Nils Faerber (port to kernel 2.4)
-M:	Nils Faerber <[email protected]>
+M:	[email protected]
 S:	Maintained
 
 CODA FILE SYSTEM
Signature · 1 line
1.5.6.5
#6 lore raw

PATCH 1/1 MAINTAINERS: add a realname for [email protected]

Without it my script to merge the P and M fields fails to assign the two realnames to the three email addresses.

---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
MAINTAINERS +2 -2
index fdea0d3..6b2ea6e 100644
@@ -1635,13 +1635,13 @@ L:	[email protected]
 S:	Maintained
 
 EXT3 FILE SYSTEM
-P:	Stephen Tweedie, Andrew Morton
+P:	Stephen Tweedie, Andrew Morton, Andreas Dilger
 M:	[email protected], [email protected], [email protected]
 L:	[email protected]
 S:	Maintained
 
 EXT4 FILE SYSTEM
-P:	Stephen Tweedie, Andrew Morton
+P:	Stephen Tweedie, Andrew Morton, Andreas Dilger
 M:	[email protected], [email protected], [email protected]
 L:	[email protected]
 S:	Maintained
Signature · 1 line
1.5.6.5
#7 lore raw

PATCH 1/1 MAINTAINERS: remove real names from M fields

One of the next commit merges P and M fields. So the real name is only needed once.

---
 MAINTAINERS |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
MAINTAINERS +3 -3
index 6b2ea6e..19fa2d5 100644
@@ -335,7 +335,7 @@ S:	Maintained
 
 AHA152X SCSI DRIVER
 P:	Juergen E. Fischer
-M:	Juergen Fischer <[email protected]>
+M:	[email protected]
 L:	[email protected]
 S:	Maintained
 
@@ -2064,14 +2064,14 @@ S:	Maintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:	Paul Bristow
-M:	Paul Bristow <[email protected]>
+M:	[email protected]
 W:	http://paulbristow.net/linux/idefloppy.html
 L:	[email protected]
 S:	Maintained
 
 IDE/ATAPI TAPE DRIVERS
 P:	Gadi Oxman
-M:	Gadi Oxman <[email protected]>
+M:	[email protected]
 L:	[email protected]
 S:	Maintained
 
Signature · 1 line
1.5.6.5
#8 lore raw

PATCH 1/1 MAINTAINERS: put corresponding realnames and mail addresses together

... otherwise my script to merge P and M fields has not chance to do its job.

---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
MAINTAINERS +2 -2
index 19fa2d5..5ad6e50 100644
@@ -1510,8 +1510,8 @@ S:	Supported
 
 EDAC-E752X
 P:	Mark Gross
-P:	Doug Thompson
 M:	[email protected]
+P:	Doug Thompson
 M:	[email protected]
 L:	[email protected]
 W:	bluesmoke.sourceforge.net
@@ -1547,8 +1547,8 @@ S:	Maintained
 
 EDAC-I82975X
 P:	Ranganathan Desikan
-P:	Arvind R.
 M:	[email protected]
+P:	Arvind R.
 M:	[email protected]
 L:	[email protected]
 W:	bluesmoke.sourceforge.net
Signature · 1 line
1.5.6.5
#9 lore raw

PATCH 1/1 MAINTAINERS: fix alphabetic ordering

This change was done using the following Python script:

#! /usr/bin/env python

import locale
import re
import sys
import tempfile

locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')

re_start = re.compile('P:')
re_topic = re.compile('[0-9a-zA-Z][^:]')
# F is undefined but used
re_field = re.compile('[PMLWTSF]:')
re_empty = re.compile('\s*$')

prologue = True
current_topic = None
topic = dict()
fixed_maintainers = tempfile.TemporaryFile()

for line in open('MAINTAINERS'):
if prologue:
print >> fixed_maintainers, line,
mo = re_start.match(line)
if mo:
prologue = False

continue

mo = re_topic.match(line)
if mo:
current_topic = line
if topic.has_key(current_topic):
sys.exit(1)
topic[current_topic] = list()
continue

elif current_topic is None:
# rest of prologue
print >> fixed_maintainers, line,

continue

assert not current_topic is None

mo = re_field.match(line)
if mo:
topic[current_topic].append(line)

else:
mo = re_empty.match(line)
if not mo:
print >> sys.stderr, 'tralala', current_topic, repr(line) sys.exit(1)

first = True

the_rest = 'THE REST\n'
have_the_rest = False

# sort case insensitive
for t, body in sorted(topic.iteritems(), key=lambda i: i[0].upper()):
if t == the_rest:
have_the_rest = True
continue

if first:
first = False
else:
print >> fixed_maintainers

print >> fixed_maintainers, t,
for line in body:
print >> fixed_maintainers, line,

if have_the_rest:
print >> fixed_maintainers

print >> fixed_maintainers, the_rest,
for line in topic[the_rest]:
print >> fixed_maintainers, line,

fixed_maintainers.seek(0)

maintainers = open('MAINTAINERS', 'w')
for line in fixed_maintainers:
print >> maintainers, line,

---
 MAINTAINERS | 1250 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 625 insertions(+), 625 deletions(-)

I deleted the actual patch to save some bytes. To get the real patch you have several possibilities:

a) look at http://modarm9.com/git/people/ukleinek/linux-2.6.git?a=commit;h=7f347bb1e138857fabc059b791cf50240fedd61f;
b) fetch/pull from the maintainers branch at

git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux-2.6.git maintainers

; or
c) extract the script above and apply it

Note that a) and b) probably stop working in the future.

Best regards
Uwe

#10 lore raw

PATCH 1/1 MAINTAINERS: merge P and M fields to ease copy'n'paste

This was suggested by Sam Ravnborg and done using the following Python script:

#! /usr/bin/env python

import locale
import re
import sys
import tempfile

locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')

re_person = re.compile(r'P:(\s*)(.*)')
re_mail = re.compile(r'M:\s*(.*)')

fixed_maintainers = tempfile.TemporaryFile()

current_persons = None
current_persons_used = False

for lineno, line in enumerate(open('MAINTAINERS')):
mo = re_person.match(line)
if mo:
if current_persons and not current_persons_used:
print >> fixed_maintainers, 'P:%s%s' % (current_persons_intend, ', '.join(current_persons))

current_persons = re.split(r',\s*', mo.group(2)) current_persons_intend = mo.group(1) current_persons_used = False
continue

mo = re_mail.match(line)
if mo:
if current_persons is None:
print 'mail without person at line %d' % (lineno + 1) sys.exit(1)

mail = re.split(r',\s*', mo.group(1))

if mail == ['Mail patches to']:
mail = ['[email protected]']

if len(mail) != len(current_persons):
if len(mail) == 1:
current_persons = ['%s' % ', '.join(current_persons)]
elif len(current_persons) == 1:
current_persons = len(mail) * current_persons
else:
print 'number of persons doesn\'t match number of mail addresses at line %d' % (lineno + 1) sys.exit(1)

print >> fixed_maintainers, 'P:%s' % current_persons_intend + ', '.join('%s <%s>' % pm for pm in zip(current_persons, mail)) current_persons_used = True

else:
if current_persons and not current_persons_used:
# either there is no mail address or the entry is already correct
print >> fixed_maintainers, 'P:%s%s' % (current_persons_intend, ', '.join(current_persons))

current_persons = None
print >> fixed_maintainers, line,

fixed_maintainers.seek(0)

maintainers = open('MAINTAINERS', 'w')
for line in fixed_maintainers:
print >> maintainers, line,

---
 MAINTAINERS | 2363 ++++++++++++++++++++---------------------------------------
 1 files changed, 793 insertions(+), 1570 deletions(-)

I deleted the actual patch to save some bytes. To get the real patch you have several possibilities:

a) look at http://modarm9.com/git/people/ukleinek/linux-2.6.git?a=commit;h=33c64dab660857949c9a78f2a8edca14d30455c5;
b) fetch/pull from the maintainers branch at

git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux-2.6.git maintainers

; or
c) extract the script above and apply it

Note that a) and b) probably stop working in the future.

Best regards
Uwe

#11 lore raw

Re: [PATCH] Reformat MAINTAINERS entry for Cirrus CS4280/CS461X sound driver

In reply to Uwe Kleine-König

Hello,

Quoted 1 line · Uwe Kleine-König
Cc Thomas Woller <[email protected]>

Note, for Thomas' address I get a "permanent fatal error":

reason: 550 5.0.0 <[email protected]>... Mailbox disabled for this username

The entry looks outdated anyhow ("kernel 2.2 driver"). Should I simply delete it. The other hunk can/should move to the patch "MAINTAINERS:
remove real names from M fields" anyhow ...

Best regards
Uwe

Signature · 3 lines
Uwe Kleine-König

http://www.google.com/search?q=speed+of+light%3D
#12 lore raw

Re: [PATCH] Reformat MAINTAINERS entry for Cirrus CS4280/CS461X sound driver

In reply to Uwe Kleine-König

Hi!
Thanks, I am fine with this change too.

Cheers
nils

Quoted 31 lines · Uwe Kleine-König

replace the (anyhow obvious) company name by Thomas' realname and remove Nils' realname from his M field which is already in the corresponding P field.

The old entry broke my script to merge the P and M fields.

Cc Thomas Woller <[email protected]>
Cc Nils Faerber <[email protected]>
---
 MAINTAINERS |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
MAINTAINERS +3 -3
index 186be3b..fdea0d3 100644
@@ -1113,10 +1113,10 @@ L:	[email protected]
 S:	Supported
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
-P:	Cirrus Logic Corporation (kernel 2.2 driver)
-M:	Cirrus Logic Corporation, Thomas Woller <[email protected]>
+P:	Thomas Woller (kernel 2.2 driver)
+M:	[email protected]
 P:	Nils Faerber (port to kernel 2.4)
-M:	Nils Faerber <[email protected]>
+M:	[email protected]
 S:	Maintained
 
 CODA FILE SYSTEM
Signature · 4 lines
kernel concepts GbR      Tel: +49-271-771091-12
Sieghuetter Hauptweg 48  Fax: +49-271-771091-19
D-57072 Siegen           Mob: +49-176-21024535
http://www.kernelconcepts.de
#13 lore raw

MAINTAINERS cleanup

In reply to Uwe Kleine-König

Hello,

here comes a new version of my MAINTAINERS cleanup series.

I made the following changes since last time:

- remove one P/M entry for CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER that refers to kernel 2.2 and has a failing email address.

- move the removing of Nils' realname to the commit where the same change is done for some other people.

The resulting shortlog and diffstat are below.

I updated my branch at

git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux-2.6.git maintainers

with the current patches and will send them as a reply to this mail.

On top of these fixing the alphabetical ordering and merging P and M fields with my script is possible. (The branch above has the change, but I will not send the resulting patches because they are too big.)

Best regards
Uwe

Uwe Kleine-König (4):
MAINTAINERS: Remove a stale entry refering to kernel 2.2
MAINTAINERS: add a realname for [email protected]
MAINTAINERS: remove real names from M fields
MAINTAINERS: put corresponding realnames and mail addresses together

 MAINTAINERS |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
Signature · 3 lines
Uwe Kleine-König

dd if=/proc/self/exe bs=1 skip=1 count=3 2>/dev/null
#14 lore raw

PATCH 1/1 MAINTAINERS: Remove a stale entry refering to kernel 2.2

Moreover sending an email to [email protected] results in a "permanent fatal error" (reason: 550 5.0.0 <[email protected]>... Mailbox disabled for this username)

---
 MAINTAINERS |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
MAINTAINERS +0 -2
index 186be3b..dc4107a 100644
@@ -1113,8 +1113,6 @@ L:	[email protected]
 S:	Supported
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
-P:	Cirrus Logic Corporation (kernel 2.2 driver)
-M:	Cirrus Logic Corporation, Thomas Woller <[email protected]>
 P:	Nils Faerber (port to kernel 2.4)
 M:	Nils Faerber <[email protected]>
 S:	Maintained
Signature · 1 line
1.5.6.5
#15 lore raw

PATCH 1/1 MAINTAINERS: add a realname for [email protected]

Without it my script to merge the P and M fields fails to assign the two realnames to the three email addresses.

---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
MAINTAINERS +2 -2
index dc4107a..cd46667 100644
@@ -1633,13 +1633,13 @@ L:	[email protected]
 S:	Maintained
 
 EXT3 FILE SYSTEM
-P:	Stephen Tweedie, Andrew Morton
+P:	Stephen Tweedie, Andrew Morton, Andreas Dilger
 M:	[email protected], [email protected], [email protected]
 L:	[email protected]
 S:	Maintained
 
 EXT4 FILE SYSTEM
-P:	Stephen Tweedie, Andrew Morton
+P:	Stephen Tweedie, Andrew Morton, Andreas Dilger
 M:	[email protected], [email protected], [email protected]
 L:	[email protected]
 S:	Maintained
Signature · 1 line
1.5.6.5
#16 lore raw

PATCH 1/1 MAINTAINERS: remove real names from M fields

One of the next commit merges P and M fields. So the real name is only needed once.

---
 MAINTAINERS |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
MAINTAINERS +4 -4
index cd46667..a4932fd 100644
@@ -335,7 +335,7 @@ S:	Maintained
 
 AHA152X SCSI DRIVER
 P:	Juergen E. Fischer
-M:	Juergen Fischer <[email protected]>
+M:	[email protected]
 L:	[email protected]
 S:	Maintained
 
@@ -1114,7 +1114,7 @@ S:	Supported
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:	Nils Faerber (port to kernel 2.4)
-M:	Nils Faerber <[email protected]>
+M:	[email protected]
 S:	Maintained
 
 CODA FILE SYSTEM
@@ -2062,14 +2062,14 @@ S:	Maintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:	Paul Bristow
-M:	Paul Bristow <[email protected]>
+M:	[email protected]
 W:	http://paulbristow.net/linux/idefloppy.html
 L:	[email protected]
 S:	Maintained
 
 IDE/ATAPI TAPE DRIVERS
 P:	Gadi Oxman
-M:	Gadi Oxman <[email protected]>
+M:	[email protected]
 L:	[email protected]
 S:	Maintained
 
Signature · 1 line
1.5.6.5
#17 lore raw

PATCH 1/1 MAINTAINERS: put corresponding realnames and mail addresses together

... otherwise my script to merge P and M fields has not chance to do its job.

---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
MAINTAINERS +2 -2
index a4932fd..29f77fa 100644
@@ -1508,8 +1508,8 @@ S:	Supported
 
 EDAC-E752X
 P:	Mark Gross
-P:	Doug Thompson
 M:	[email protected]
+P:	Doug Thompson
 M:	[email protected]
 L:	[email protected]
 W:	bluesmoke.sourceforge.net
@@ -1545,8 +1545,8 @@ S:	Maintained
 
 EDAC-I82975X
 P:	Ranganathan Desikan
-P:	Arvind R.
 M:	[email protected]
+P:	Arvind R.
 M:	[email protected]
 L:	[email protected]
 W:	bluesmoke.sourceforge.net
Signature · 1 line
1.5.6.5
#18 lore raw

PATCH RESEND 1/1 MAINTAINERS cleanup

In reply to Uwe Kleine-König

Hello,

I resend the last version of my MAINTAINERS cleanup series because I didn't get any feedback last time but still consider it valuable.

It it freshly rebased on top of v2.6.27-rc7 and available on

git://git.breakpoint.cc/ukleinek/linux-2.6 maintainers

an has the following changes listed below. The first four commits were done to allow merging P and M fields with the help of a script (i.e. the sixth commit). The remaining patch restores the alphabetic ordering in the file (scripted).

If you fear merge conflicts or simply that new entries that don't follow the new format, I can do a MAINTAINERS maintainership and sort out the conflicts.

Best regards
Uwe

Uwe Kleine-König (6):
MAINTAINERS: Remove a stale entry refering to kernel 2.2
MAINTAINERS: add a realname for [email protected]
MAINTAINERS: remove real names from M fields
MAINTAINERS: put corresponding realnames and mail addresses together
MAINTAINERS: fix alphabetic ordering
MAINTAINERS: merge P and M fields to ease copy'n'paste

 MAINTAINERS | 3130 ++++++++++++++++++++++-------------------------------------
 1 files changed, 1176 insertions(+), 1954 deletions(-)