Skip to contentSkip to conversation

MAINTAINERS: File pattern cleanups

PATCH In review Joe Perches 5 participants 12 messages Sep 19, 2010 – Sep 21, 2010

lore
Share & tools
lore
#0 lore raw

cover MAINTAINERS: File pattern cleanups

Just some cleaning.

Joe Perches (6):
MAINTAINERS: Fix Colibri PXA270 file pattern
MAINTAINERS: Merge imote2 and stargate
MAINTAINERS: Merge s3c-244x sections
MAINTAINERS: Merge s3c6400 and 6410 to 64xx
MAINTAINERS: Remove USB OV511 DRIVER
MAINTAINERS: Remove USB ZC0301 DRIVER

 MAINTAINERS |   54 +++++-------------------------------------------------
 1 files changed, 5 insertions(+), 49 deletions(-)
Signature · 1 line
1.7.3.rc1
#1 lore raw

PATCH 1/6 MAINTAINERS: Fix Colibri PXA270 file pattern

The original commit 403d29713e0a5c671d852913a0b5935c0ff00cb7 started with the wrong file pattern.

CC Marek Vasut <[email protected]>
---
 MAINTAINERS |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
MAINTAINERS +1 -2
index 4c14636..a9f0567 100644
@@ -708,8 +708,7 @@ ARM/INCOME PXA270 SUPPORT
 M:	Marek Vasut <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
-F:	arch/arm/mach-pxa/income.c
-F:	arch/arm/mach-pxa/include/mach-pxa/income.h
+F:	arch/arm/mach-pxa/colibri-pxa270-income.c
 
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:	Lennert Buytenhek <[email protected]>
Signature · 1 line
1.7.3.rc1
#2 lore raw

Re: [PATCH 1/6] MAINTAINERS: Fix Colibri PXA270 file pattern

Dne Po 20. září 2010 01:10:29 Joe Perches napsal(a):

Quoted 4 lines

The original commit 403d29713e0a5c671d852913a0b5935c0ff00cb7 started with the wrong file pattern.

CC Marek Vasut <[email protected]>

Good catch, thanks!

Quoted 20 lines
---
 MAINTAINERS |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
MAINTAINERS +1 -2
index 4c14636..a9f0567 100644
@@ -708,8 +708,7 @@ ARM/INCOME PXA270 SUPPORT
 M:	Marek Vasut <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
-F:	arch/arm/mach-pxa/income.c
-F:	arch/arm/mach-pxa/include/mach-pxa/income.h
+F:	arch/arm/mach-pxa/colibri-pxa270-income.c
 
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:	Lennert Buytenhek <[email protected]>
#3 lore raw

PATCH 2/6 MAINTAINERS: Merge imote2 and stargate

In reply to Joe Perches

Removed by commit dcd925f95194da42e42cea7e5f901f9746cf441c

CC Jonathan Cameron <[email protected]>
CC Eric Miao <[email protected]>
---
 MAINTAINERS |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
MAINTAINERS +1 -7
index a9f0567..03929b5 100644
@@ -755,13 +755,7 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-ixp4xx/
 
-ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
-M:	Jonathan Cameron <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-F:	arch/arm/mach-pxa/imote2.c
-
-ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
 M:	Jonathan Cameron <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
Signature · 1 line
1.7.3.rc1
Acked-by on v1 2/6
#4 lore raw

Re: [PATCH 2/6] MAINTAINERS: Merge imote2 and stargate

Quoted 4 lines · Joe Perches

Removed by commit dcd925f95194da42e42cea7e5f901f9746cf441c

CC Jonathan Cameron <[email protected]>
CC Eric Miao <[email protected]>

Doh! Good point, I forgot about the MAINTAINERS file when I did that merge. Thanks Joe,

Quoted 2 lines
Quoted 23 lines
---
 MAINTAINERS |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
MAINTAINERS +1 -7
index a9f0567..03929b5 100644
@@ -755,13 +755,7 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-ixp4xx/
 
-ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
-M:	Jonathan Cameron <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-F:	arch/arm/mach-pxa/imote2.c
-
-ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
 M:	Jonathan Cameron <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
#5 lore raw

Re: [PATCH 2/6] MAINTAINERS: Merge imote2 and stargate

Quoted 11 lines · Jonathan Cameron
Quoted 4 lines · Joe Perches

Removed by commit dcd925f95194da42e42cea7e5f901f9746cf441c

CC Jonathan Cameron <[email protected]>
CC Eric Miao <[email protected]>

Doh!  Good point, I forgot about the MAINTAINERS file when I did that merge. Thanks Joe,

Quoted 2 lines

Andrew,

Would be appreciated if you could help merge this. Thanks.

Quoted 27 lines
Quoted 23 lines

---
 MAINTAINERS |    8 +-------

 1 files changed, 1 insertions(+), 7 deletions(-)
MAINTAINERS +0 -0
index a9f0567..03929b5 100644
@@ -755,13 +755,7 @@ L:       [email protected] (moderated for non-subscribers)

 S:   Maintained
 F:   arch/arm/mach-ixp4xx/

MAINTAINERS +1 -7
-ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
-M:   Jonathan Cameron <[email protected]>
-L:   [email protected] (moderated for non-subscribers)
-S:   Maintained
-F:   arch/arm/mach-pxa/imote2.c
-
-ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT

 M:   Jonathan Cameron <[email protected]>
 L:   [email protected] (moderated for non-subscribers)
 S:   Maintained

#6 lore raw

PATCH 3/6 MAINTAINERS: Merge s3c-244x sections

In reply to Joe Perches

Removed by commit 70556b143ae4cf404a73c2461a6bf7fef3fefbf7

CC Ben Dooks <[email protected]>
---
 MAINTAINERS |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
MAINTAINERS +1 -14
index 03929b5..a887d83 100644
@@ -920,25 +920,12 @@ W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c2410/
 
-ARM/S3C2440 ARM ARCHITECTURE
+ARM/S3C244x ARM ARCHITECTURE
 M:	Ben Dooks <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c2440/
-
-ARM/S3C2442 ARM ARCHITECTURE
-M:	Ben Dooks <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-W:	http://www.fluff.org/ben/linux/
-S:	Maintained
-F:	arch/arm/mach-s3c2442/
-
-ARM/S3C2443 ARM ARCHITECTURE
-M:	Ben Dooks <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-W:	http://www.fluff.org/ben/linux/
-S:	Maintained
 F:	arch/arm/mach-s3c2443/
 
 ARM/S3C6400 ARM ARCHITECTURE
Signature · 1 line
1.7.3.rc1
#7 lore raw

PATCH 4/6 MAINTAINERS: Merge s3c6400 and 6410 to 64xx

In reply to Joe Perches

Removed by commit 431107ea5b680a24a4d01fbd3a178a3eb932f378

CC Ben Dooks <[email protected]>
---
 MAINTAINERS |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)
MAINTAINERS +2 -9
index a887d83..5011ac4 100644
@@ -928,19 +928,12 @@ S:	Maintained
 F:	arch/arm/mach-s3c2440/
 F:	arch/arm/mach-s3c2443/
 
-ARM/S3C6400 ARM ARCHITECTURE
+ARM/S3C64xx ARM ARCHITECTURE
 M:	Ben Dooks <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
-F:	arch/arm/mach-s3c6400/
-
-ARM/S3C6410 ARM ARCHITECTURE
-M:	Ben Dooks <[email protected]>
-L:	[email protected] (moderated for non-subscribers)
-W:	http://www.fluff.org/ben/linux/
-S:	Maintained
-F:	arch/arm/mach-s3c6410/
+F:	arch/arm/mach-s3c64xx/
 
 ARM/SHMOBILE ARM ARCHITECTURE
 M:	Paul Mundt <[email protected]>
Signature · 1 line
1.7.3.rc1
#8 lore raw

PATCH 5/6 MAINTAINERS: Remove USB OV511 DRIVER

In reply to Joe Perches

Removed by commit 7373ab3669aec93f8c8f1ace7845c41d54ed6e3e

CC Amerigo Wang <[email protected]>
CC Mauro Carvalho Chehab <[email protected]>
---
 MAINTAINERS |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
MAINTAINERS +0 -7
index 5011ac4..01cc1e2 100644
@@ -6021,13 +6021,6 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/usb/serial/option.c
 
-USB OV511 DRIVER
-M:	Mark McClelland <[email protected]>
-L:	[email protected]
-W:	http://alpha.dyndns.org/ov511/
-S:	Maintained
-F:	drivers/media/video/ov511.*
-
 USB PEGASUS DRIVER
 M:	Petko Manolov <[email protected]>
 L:	[email protected]
Signature · 1 line
1.7.3.rc1
#10 lore raw

PATCH 6/6 MAINTAINERS: Remove USB ZC0301 DRIVER

In reply to Joe Perches

Removed by commit 0d58cef664e01fb1848833455bfdbe1a3d91044c

CC Amerigo Wang <[email protected]>
CC Mauro Carvalho Chehab <[email protected]>
---
 MAINTAINERS |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
MAINTAINERS +0 -10
index 01cc1e2..34337b8 100644
@@ -6181,16 +6181,6 @@ S:	Supported
 F:	drivers/usb/host/xhci*
 F:	drivers/usb/host/pci-quirks*
 
-USB ZC0301 DRIVER
-M:	Luca Risolia <[email protected]>
-L:	[email protected]
-L:	[email protected]
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-W:	http://www.linux-projects.org
-S:	Maintained
-F:	Documentation/video4linux/zc0301.txt
-F:	drivers/media/video/zc0301/
-
 USB ZD1201 DRIVER
 L:	[email protected]
 W:	http://linux-lc100020.sourceforge.net
Signature · 1 line
1.7.3.rc1