I no longer work at Bluewater Systems. Update my email address accordingly.
Signed-off-by: Ryan Mallon <[email protected]>
Cc: Andre Renaud <[email protected]>
Cc: H Hartley Sweeten <[email protected]>
Cc: Russell King <[email protected]>
Cc: Nicolas Ferre <[email protected]>
Cc: Andrew Victor <[email protected]>
Cc: David Woodhouse <[email protected]>
Cc: Anton Vorontsov <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
MAINTAINERS | 2 +-
arch/arm/mach-at91/board-snapper9260.c | 2 +-
arch/arm/mach-ep93xx/dma-m2p.c | 2 +-
arch/arm/mach-ep93xx/gpio.c | 2 +-
arch/arm/mach-ep93xx/simone.c | 4 ++--
arch/arm/mach-ep93xx/snappercl15.c | 4 ++--
drivers/mtd/devices/sst25l.c | 4 ++--
drivers/power/ds2782_battery.c | 4 ++--
drivers/video/ep93xx-fb.c | 2 +-
sound/soc/ep93xx/ep93xx-i2s.c | 4 ++--
sound/soc/ep93xx/ep93xx-pcm.c | 4 ++--
sound/soc/ep93xx/snappercl15.c | 4 ++--
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 29801f7..26aaf6c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -683,7 +683,7 @@ T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git
ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
M: Hartley Sweeten <[email protected]>
-M: Ryan Mallon <[email protected]>
+M: Ryan Mallon <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-ep93xx/
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index 3eb0a11..e97d4a8 100644
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -4,7 +4,7 @@
* Copyright (C) 2010 Bluewater System Ltd
*
* Author: Andre Renaud <[email protected]>
- * Author: Ryan Mallon <[email protected]>
+ * Author: Ryan Mallon <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ep93xx/dma-m2p.c b/arch/arm/mach-ep93xx/dma-m2p.c
index a696d35..965bb2a 100644
--- a/arch/arm/mach-ep93xx/dma-m2p.c
+++ b/arch/arm/mach-ep93xx/dma-m2p.c
@@ -5,7 +5,7 @@
* Copyright (C) 2006 Lennert Buytenhek <[email protected]>
* Copyright (C) 2006 Applied Data Systems
*
- * Copyright (C) 2009 Ryan Mallon <[email protected]>
+ * Copyright (C) 2009 Ryan Mallon <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c
index 415dce3..e479812 100644
--- a/arch/arm/mach-ep93xx/gpio.c
+++ b/arch/arm/mach-ep93xx/gpio.c
@@ -3,7 +3,7 @@
*
* Generic EP93xx GPIO handling
*
- * Copyright (c) 2008 Ryan Mallon <[email protected]>
+ * Copyright (c) 2008 Ryan Mallon <[email protected]>
*
* Based on code originally from:
* linux/arch/arm/mach-ep93xx/core.c
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
index d96dc1c..f94b7e9 100644
--- a/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@ -2,7 +2,7 @@
* arch/arm/mach-ep93xx/simone.c
* Simplemachines Sim.One support.
*
- * Copyright (C) 2010 Ryan Mallon <[email protected]>
+ * Copyright (C) 2010 Ryan Mallon <[email protected]>
*
* Based on the 2.6.24.7 support:
* Copyright (C) 2009 Simplemachines
@@ -65,7 +65,7 @@ static void __init simone_init_machine(void)
}
MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board")
-/* Maintainer: Ryan Mallon <[email protected]> */
+/* Maintainer: Ryan Mallon <[email protected]> */
.boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index ac601fe..a06f349 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -3,7 +3,7 @@
* Bluewater Systems Snapper CL15 system module
*
* Copyright (C) 2009 Bluewater Systems Ltd
- * Author: Ryan Mallon <[email protected]>
+ * Author: Ryan Mallon <[email protected]>
*
* NAND code adapted from driver by:
* Andre Renaud <[email protected]>
@@ -162,7 +162,7 @@ static void __init snappercl15_init_machine(void)
}
MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15")
- /* Maintainer: Ryan Mallon <[email protected]> */
+ /* Maintainer: Ryan Mallon <[email protected]> */
.boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 1e2c430..73f6af0 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -5,7 +5,7 @@
*
* Copyright © 2009 Bluewater Systems Ltd
* Author: Andre Renaud <[email protected]>
- * Author: Ryan Mallon <[email protected]>
+ * Author: Ryan Mallon <[email protected]>
*
* Based on m25p80.c
*
@@ -498,5 +498,5 @@ module_exit(sst25l_exit);
MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips");
MODULE_AUTHOR("Andre Renaud <[email protected]>, "
- "Ryan Mallon <[email protected]>");
+ "Ryan Mallon <[email protected]>");
MODULE_LICENSE("GPL");
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index 4d2dc4f..48f9c80 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2009 Bluewater Systems Ltd
*
- * Author: Ryan Mallon <[email protected]>
+ * Author: Ryan Mallon <[email protected]>
*
* DS2786 added by Yulia Vilensky <[email protected]>
*
@@ -416,6 +416,6 @@ static void __exit ds278x_exit(void)
}
module_exit(ds278x_exit);
-MODULE_AUTHOR("Ryan Mallon <[email protected]>");
+MODULE_AUTHOR("Ryan Mallon <[email protected]>");
MODULE_DESCRIPTION("Maxim/Dallas DS2782 Stand-Alone Fuel Gauage IC driver");
MODULE_LICENSE("GPL");
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index cbdb1bd..b326c2f 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -4,7 +4,7 @@
* Framebuffer support for the EP93xx series.
*
* Copyright (C) 2007 Bluewater Systems Ltd
- * Author: Ryan Mallon <[email protected]>
+ * Author: Ryan Mallon <[email protected]>
*
* Copyright (c) 2009 H Hartley Sweeten <[email protected]>
*
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
index 042f4e9..56197d8 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -2,7 +2,7 @@
* linux/sound/soc/ep93xx-i2s.c
* EP93xx I2S driver
*
- * Copyright (C) 2010 Ryan Mallon <[email protected]>
+ * Copyright (C) 2010 Ryan Mallon <[email protected]>
*
* Based on the original driver by:
* Copyright (C) 2007 Chase Douglas <chasedouglas@gmail>
@@ -477,6 +477,6 @@ module_init(ep93xx_i2s_init);
module_exit(ep93xx_i2s_exit);
MODULE_ALIAS("platform:ep93xx-i2s");
-MODULE_AUTHOR("Ryan Mallon <[email protected]>");
+MODULE_AUTHOR("Ryan Mallon <[email protected]>");
MODULE_DESCRIPTION("EP93XX I2S driver");
MODULE_LICENSE("GPL");
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c
index a456e49..eba0dc8 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.c
+++ b/sound/soc/ep93xx/ep93xx-pcm.c
@@ -5,7 +5,7 @@
* Copyright (C) 2006 Applied Data Systems
*
* Rewritten for the SoC audio subsystem (Based on PXA2xx code):
- * Copyright (c) 2008 Ryan Mallon <[email protected]>
+ * Copyright (c) 2008 Ryan Mallon <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -333,6 +333,6 @@ static void __exit ep93xx_soc_platform_exit(void)
module_init(ep93xx_soc_platform_init);
module_exit(ep93xx_soc_platform_exit);
-MODULE_AUTHOR("Ryan Mallon <[email protected]>");
+MODULE_AUTHOR("Ryan Mallon <[email protected]>");
MODULE_DESCRIPTION("EP93xx ALSA PCM interface");
MODULE_LICENSE("GPL");
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index dfe1d7f..7608195 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -2,7 +2,7 @@
* snappercl15.c -- SoC audio for Bluewater Systems Snapper CL15 module
*
* Copyright (C) 2008 Bluewater Systems Ltd
- * Author: Ryan Mallon <[email protected]>
+ * Author: Ryan Mallon <[email protected]>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -140,7 +140,7 @@ static void __exit snappercl15_exit(void)
module_init(snappercl15_init);
module_exit(snappercl15_exit);
-MODULE_AUTHOR("Ryan Mallon <[email protected]>");
+MODULE_AUTHOR("Ryan Mallon <[email protected]>");
MODULE_DESCRIPTION("ALSA SoC Snapper CL15");
MODULE_LICENSE("GPL");
--
1.7.0.4
On Thursday, June 09, 2011 4:13 PM, Ryan Mallon wrote:
>
> I no longer work at Bluewater Systems. Update my email address accordingly.
>
> Signed-off-by: Ryan Mallon <[email protected]>
> Cc: Andre Renaud <[email protected]>
> Cc: H Hartley Sweeten <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: Nicolas Ferre <[email protected]>
> Cc: Andrew Victor <[email protected]>
> Cc: David Woodhouse <[email protected]>
> Cc: Anton Vorontsov <[email protected]>
> Cc: Paul Mundt <[email protected]>
> Cc: Liam Girdwood <[email protected]>
> Cc: Mark Brown <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
Acked-by: H Hartley Sweeten <[email protected]>
Ryan,
There will probable be some merge conflicts with this.
> MAINTAINERS | 2 +-
> arch/arm/mach-at91/board-snapper9260.c | 2 +-
> arch/arm/mach-ep93xx/dma-m2p.c | 2 +-
This file is gone after Mika's DMA patches which are already in linux-next.
> arch/arm/mach-ep93xx/gpio.c | 2 +-
This file has been moved and renamed. There are also a number of patches
already applied to it in linux-next.
> arch/arm/mach-ep93xx/simone.c | 4 ++--
> arch/arm/mach-ep93xx/snappercl15.c | 4 ++--
> drivers/mtd/devices/sst25l.c | 4 ++--
There are a couple patches to this file in linux-next.
> drivers/power/ds2782_battery.c | 4 ++--
> drivers/video/ep93xx-fb.c | 2 +-
> sound/soc/ep93xx/ep93xx-i2s.c | 4 ++--
> sound/soc/ep93xx/ep93xx-pcm.c | 4 ++--
> sound/soc/ep93xx/snappercl15.c | 4 ++--
The others should be ok. Maybe you should rebase this patch against
linux-next?
Regards,
Hartley-
On 10/06/11 10:28, H Hartley Sweeten wrote:
> On Thursday, June 09, 2011 4:13 PM, Ryan Mallon wrote:
>> I no longer work at Bluewater Systems. Update my email address accordingly.
>>
>> Signed-off-by: Ryan Mallon<[email protected]>
>> Cc: Andre Renaud<[email protected]>
>> Cc: H Hartley Sweeten<[email protected]>
>> Cc: Russell King<[email protected]>
>> Cc: Nicolas Ferre<[email protected]>
>> Cc: Andrew Victor<[email protected]>
>> Cc: David Woodhouse<[email protected]>
>> Cc: Anton Vorontsov<[email protected]>
>> Cc: Paul Mundt<[email protected]>
>> Cc: Liam Girdwood<[email protected]>
>> Cc: Mark Brown<[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> ---
> Acked-by: H Hartley Sweeten<[email protected]>
>
> Ryan,
>
> There will probable be some merge conflicts with this.
They should be trivial to fix (or automatic). I would also like this to
get merged into 3.0 if still possible. Otherwise I'm going to get three
more months of people emailing me at the wrong address :-).
~Ryan
>> MAINTAINERS | 2 +-
>> arch/arm/mach-at91/board-snapper9260.c | 2 +-
>> arch/arm/mach-ep93xx/dma-m2p.c | 2 +-
> This file is gone after Mika's DMA patches which are already in linux-next.
>
>> arch/arm/mach-ep93xx/gpio.c | 2 +-
> This file has been moved and renamed. There are also a number of patches
> already applied to it in linux-next.
>
>> arch/arm/mach-ep93xx/simone.c | 4 ++--
>> arch/arm/mach-ep93xx/snappercl15.c | 4 ++--
>> drivers/mtd/devices/sst25l.c | 4 ++--
> There are a couple patches to this file in linux-next.
>
>> drivers/power/ds2782_battery.c | 4 ++--
>> drivers/video/ep93xx-fb.c | 2 +-
>> sound/soc/ep93xx/ep93xx-i2s.c | 4 ++--
>> sound/soc/ep93xx/ep93xx-pcm.c | 4 ++--
>> sound/soc/ep93xx/snappercl15.c | 4 ++--
> The others should be ok. Maybe you should rebase this patch against
> linux-next?
>
> Regards,
> Hartley
On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
> I no longer work at Bluewater Systems. Update my email address accordingly.
>
Is this sort of churn really necessary? By all means, update your
MAINTAINERS entry accordingly, but the rest of it is really pretty
pointless. People are invariably going to consult MAINTAINERS one way or
another and get the updated value accordingly. For the rest of these you
are just as well off ripping out the email address completely.
On 10/06/11 12:55, Paul Mundt wrote:
> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
>> I no longer work at Bluewater Systems. Update my email address accordingly.
>>
> Is this sort of churn really necessary? By all means, update your
> MAINTAINERS entry accordingly, but the rest of it is really pretty
> pointless. People are invariably going to consult MAINTAINERS one way or
> another and get the updated value accordingly. For the rest of these you
> are just as well off ripping out the email address completely.
The MAINTAINERS entry for me only cover the arm ep93xx arch. Prior to
this patch, if I do (for example)
./scripts/get_maintainer.pl -f drivers/power/ds2782_battery.c
It gives my old Bluewater email. With this change it gives my gmail
account. Not sure if that is because it extracts the email from the
source or from the git commit? Either way, the patch gets the correct
behaviour for people who send patches using get_maintainer.
~Ryan
On Fri, 2011-06-10 at 13:05 +1000, Ryan Mallon wrote:
> On 10/06/11 12:55, Paul Mundt wrote:
> > On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
> >> I no longer work at Bluewater Systems. Update my email address accordingly.
> > Is this sort of churn really necessary? By all means, update your
> > MAINTAINERS entry accordingly, but the rest of it is really pretty
> > pointless. People are invariably going to consult MAINTAINERS one way or
> > another and get the updated value accordingly. For the rest of these you
> > are just as well off ripping out the email address completely.
I agree.
> The MAINTAINERS entry for me only cover the arm ep93xx arch. Prior to
> this patch, if I do (for example)
>
> ./scripts/get_maintainer.pl -f drivers/power/ds2782_battery.c
>
> It gives my old Bluewater email. With this change it gives my gmail
> account. Not sure if that is because it extracts the email from the
> source or from the git commit?
It's the git commit.
get_maintainer uses the name and address in the first seen
commit matching on the full name where possible.
You can override this with --noremove-duplicates
$ ./scripts/get_maintainer.pl --noremove-duplicates -f drivers/power/ds2782_battery.c
Anton Vorontsov <[email protected]> (commit_signer:4/5=80%)
Ryan Mallon <[email protected]> (commit_signer:3/5=60%)
Andrew Morton <[email protected]> (commit_signer:1/5=20%)
Peter Huewe <[email protected]> (commit_signer:1/5=20%)
Mike Rapoport <[email protected]> (commit_signer:1/5=20%)
[email protected] (open list)
On 10/06/11 13:11, Joe Perches wrote:
> On Fri, 2011-06-10 at 13:05 +1000, Ryan Mallon wrote:
>> On 10/06/11 12:55, Paul Mundt wrote:
>>> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
>>>> I no longer work at Bluewater Systems. Update my email address accordingly.
>>> Is this sort of churn really necessary? By all means, update your
>>> MAINTAINERS entry accordingly, but the rest of it is really pretty
>>> pointless. People are invariably going to consult MAINTAINERS one way or
>>> another and get the updated value accordingly. For the rest of these you
>>> are just as well off ripping out the email address completely.
> I agree.
>
>> The MAINTAINERS entry for me only cover the arm ep93xx arch. Prior to
>> this patch, if I do (for example)
>>
>> ./scripts/get_maintainer.pl -f drivers/power/ds2782_battery.c
>>
>> It gives my old Bluewater email. With this change it gives my gmail
>> account. Not sure if that is because it extracts the email from the
>> source or from the git commit?
> It's the git commit.
>
> get_maintainer uses the name and address in the first seen
> commit matching on the full name where possible.
>
> You can override this with --noremove-duplicates
>
> $ ./scripts/get_maintainer.pl --noremove-duplicates -f drivers/power/ds2782_battery.c
> Anton Vorontsov<[email protected]> (commit_signer:4/5=80%)
> Ryan Mallon<[email protected]> (commit_signer:3/5=60%)
> Andrew Morton<[email protected]> (commit_signer:1/5=20%)
> Peter Huewe<[email protected]> (commit_signer:1/5=20%)
> Mike Rapoport<[email protected]> (commit_signer:1/5=20%)
> [email protected] (open list)
Okay, what is the correct fix then so that people get the right email
address for me?
~Ryan
On Fri, 2011-06-10 at 13:13 +1000, Ryan Mallon wrote:
> On 10/06/11 13:11, Joe Perches wrote:
> > On Fri, 2011-06-10 at 13:05 +1000, Ryan Mallon wrote:
> >> On 10/06/11 12:55, Paul Mundt wrote:
> >>> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
> >>>> I no longer work at Bluewater Systems. Update my email address accordingly.
> >>> Is this sort of churn really necessary?
> > get_maintainer uses the name and address in the first seen
> > commit matching on the full name where possible.
> Okay, what is the correct fix then so that people get the right email
> address for me?
I believe updating the MAINTAINERS file and
authoring and committing patches that take
your email address out of files works well.
Some think that it's better to keep current
email addresses in the files. I think it
has to do with European data retention laws.
Not sure if that applies to you.
There've been threads about changing email
addresses in files before like:
https://lkml.org/lkml/2011/4/10/89
cheers, Joe
On 10/06/11 13:24, Joe Perches wrote:
> On Fri, 2011-06-10 at 13:13 +1000, Ryan Mallon wrote:
>> On 10/06/11 13:11, Joe Perches wrote:
>>> On Fri, 2011-06-10 at 13:05 +1000, Ryan Mallon wrote:
>>>> On 10/06/11 12:55, Paul Mundt wrote:
>>>>> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
>>>>>> I no longer work at Bluewater Systems. Update my email address accordingly.
>>>>> Is this sort of churn really necessary?
>>> get_maintainer uses the name and address in the first seen
>>> commit matching on the full name where possible.
>> Okay, what is the correct fix then so that people get the right email
>> address for me?
> I believe updating the MAINTAINERS file and
> authoring and committing patches that take
> your email address out of files works well.
If I strip my email address, but leave my name and copyright in the
files the patch will have the same amount of churn right?
> Some think that it's better to keep current
> email addresses in the files. I think it
> has to do with European data retention laws.
>
> Not sure if that applies to you.
I basically just want email to arrive at the correct address. I can
catch misdirected stuff which gets Cc'ed to a mailing list, but
sometimes people send me things off list which will just get lost.
~Ryan
On Fri, Jun 10, 2011 at 01:31:54PM +1000, Ryan Mallon wrote:
> On 10/06/11 13:24, Joe Perches wrote:
> >On Fri, 2011-06-10 at 13:13 +1000, Ryan Mallon wrote:
> >>On 10/06/11 13:11, Joe Perches wrote:
> >>>On Fri, 2011-06-10 at 13:05 +1000, Ryan Mallon wrote:
> >>>>On 10/06/11 12:55, Paul Mundt wrote:
> >>>>>On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
> >>>>>>I no longer work at Bluewater Systems. Update my email address
> >>>>>>accordingly.
> >>>>>Is this sort of churn really necessary?
> >>>get_maintainer uses the name and address in the first seen
> >>>commit matching on the full name where possible.
> >>Okay, what is the correct fix then so that people get the right email
> >>address for me?
> >I believe updating the MAINTAINERS file and
> >authoring and committing patches that take
> >your email address out of files works well.
>
> If I strip my email address, but leave my name and copyright in the
> files the patch will have the same amount of churn right?
>
Not necessarily. You can leave the copyright bits intact but simply
update (or strip out) the address from the MODULE_AUTHOR part so people
still get the proper data from modinfo and so on. There are many people
with non-working email addresses in copyright statements tree-wide, so
there's certainly a precedent for it. It's also a motivator for not
bothering with inlining the email address in the future, unless it's to
avoid ambiguity (ie, a work done on behalf of an employer, who retains
all rights).
If there are files that you have authored but get_maintainers is
groveling the commits and using your old address, you can preempt this by
simply adding a MAINTAINERS entry with the appropriate file pattern, too.
On 10/06/11 13:51, Paul Mundt wrote:
> On Fri, Jun 10, 2011 at 01:31:54PM +1000, Ryan Mallon wrote:
>> On 10/06/11 13:24, Joe Perches wrote:
>>> On Fri, 2011-06-10 at 13:13 +1000, Ryan Mallon wrote:
>>>> On 10/06/11 13:11, Joe Perches wrote:
>>>>> On Fri, 2011-06-10 at 13:05 +1000, Ryan Mallon wrote:
>>>>>> On 10/06/11 12:55, Paul Mundt wrote:
>>>>>>> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
>>>>>>>> I no longer work at Bluewater Systems. Update my email address
>>>>>>>> accordingly.
>>>>>>> Is this sort of churn really necessary?
>>>>> get_maintainer uses the name and address in the first seen
>>>>> commit matching on the full name where possible.
>>>> Okay, what is the correct fix then so that people get the right email
>>>> address for me?
>>> I believe updating the MAINTAINERS file and
>>> authoring and committing patches that take
>>> your email address out of files works well.
>> If I strip my email address, but leave my name and copyright in the
>> files the patch will have the same amount of churn right?
>>
> Not necessarily. You can leave the copyright bits intact but simply
> update (or strip out) the address from the MODULE_AUTHOR part so people
> still get the proper data from modinfo and so on. There are many people
> with non-working email addresses in copyright statements tree-wide, so
> there's certainly a precedent for it. It's also a motivator for not
> bothering with inlining the email address in the future, unless it's to
> avoid ambiguity (ie, a work done on behalf of an employer, who retains
> all rights).
>
> If there are files that you have authored but get_maintainers is
> groveling the commits and using your old address, you can preempt this by
> simply adding a MAINTAINERS entry with the appropriate file pattern, too.
Okay, so what is the preferred solution. Do I leave the old address in
the files and add MAINTAINERS entries for everything with my correct
address, or do I delete my email address (but leave my name) in all of
the files?
~Ryan
On Fri, 2011-06-10 at 13:54 +1000, Ryan Mallon wrote:
> Okay, so what is the preferred solution. Do I leave the old address in
> the files and add MAINTAINERS entries for everything with my correct
> address, or do I delete my email address (but leave my name) in all of
> the files?
Another option is to add an entry in .mailmap for
your correct new and incorrect old addresses.
diff --git a/.mailmap b/.mailmap
index 353ad56..218765d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -95,6 +95,7 @@ Ralf Wildenhues <[email protected]>
Rémi Denis-Courmont <[email protected]>
Rudolf Marek <[email protected]>
Rui Saraiva <[email protected]>
+Ryan Mallon <[email protected]> <[email protected]>
Sachin P Sant <[email protected]>
Sam Ravnborg <[email protected]>
Sascha Hauer <[email protected]>
This will only work after get_maintainers is patched
to correctly parse the .mailmap entries that use this form.
I'll chat with Florian to correct this.
cheers, Joe
On Fri, 10 Jun 2011 11:55:49 +0900
Paul Mundt <[email protected]> wrote:
> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
> > I no longer work at Bluewater Systems. Update my email address accordingly.
> >
> Is this sort of churn really necessary?
Yes - stale email addresses cause all sorts of problems, particularly if
in the future the address is re-used in the company. It also causes
confusion over who owns and maintains stuff because it's never obvious
whether the resolution of an unknown address is
A. 'user has moved on, follow the user'
B. 'user has moved on, company probably has someone else assigned
to it'
On Fri, 10 Jun 2011, Ryan Mallon wrote:
> On 10/06/11 13:24, Joe Perches wrote:
> > On Fri, 2011-06-10 at 13:13 +1000, Ryan Mallon wrote:
> > > On 10/06/11 13:11, Joe Perches wrote:
> > > > On Fri, 2011-06-10 at 13:05 +1000, Ryan Mallon wrote:
> > > > > On 10/06/11 12:55, Paul Mundt wrote:
> > > > > > On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
> > > > > > > I no longer work at Bluewater Systems. Update my email address
> > > > > > > accordingly.
> > > > > > Is this sort of churn really necessary?
> > > > get_maintainer uses the name and address in the first seen
> > > > commit matching on the full name where possible.
> > > Okay, what is the correct fix then so that people get the right email
> > > address for me?
> > I believe updating the MAINTAINERS file and
> > authoring and committing patches that take
> > your email address out of files works well.
>
> If I strip my email address, but leave my name and copyright in the files the
> patch will have the same amount of churn right?
>
This time around, yes. But the next time you change email you then don't
have to update those files again, just CREDITS/MAINTAINERS etc.
--
Jesper Juhl <[email protected]> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
Entries that used formats other than "Proper Name <[email protected]>"
were not parsed properly.
Try to improve the parsing so that the entries in the forms of:
Proper Name <[email protected]> <[email protected]>
and
Proper Name <[email protected]> Commit Name <[email protected]>
are transformed correctly.
Signed-off-by: Joe Perches <[email protected]>
---
scripts/get_maintainer.pl | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index d29a8d7..eb2f1e6 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -328,7 +328,8 @@ sub read_mailmap {
# name1 <mail1> <mail2>
# name1 <mail1> name2 <mail2>
# (see man git-shortlog)
- if (/^(.+)<(.+)>$/) {
+
+ if (/^([^<]+)<([^>]+)>$/) {
my $real_name = $1;
my $address = $2;
@@ -336,13 +337,13 @@ sub read_mailmap {
($real_name, $address) = parse_email("$real_name <$address>");
$mailmap->{names}->{$address} = $real_name;
- } elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) {
+ } elsif (/^<([^>]+)>\s*<([^>]+)>$/) {
my $real_address = $1;
my $wrong_address = $2;
$mailmap->{addresses}->{$wrong_address} = $real_address;
- } elsif (/^(.+)<([^\s]+)>\s*<([^\s]+)>$/) {
+ } elsif (/^(.+)<([^>]+)>\s*<([^>]+)>$/) {
my $real_name = $1;
my $real_address = $2;
my $wrong_address = $3;
@@ -353,7 +354,7 @@ sub read_mailmap {
$mailmap->{names}->{$wrong_address} = $real_name;
$mailmap->{addresses}->{$wrong_address} = $real_address;
- } elsif (/^(.+)<([^\s]+)>\s*([^\s].*)<([^\s]+)>$/) {
+ } elsif (/^(.+)<([^>]+)>\s*(.+)\s*<([^>]+)>$/) {
my $real_name = $1;
my $real_address = $2;
my $wrong_name = $3;
--
1.7.5.rc3.dirty
On Fri, 10 Jun 2011 03:37:23 -0700
Joe Perches <[email protected]> wrote:
> Entries that used formats other than "Proper Name <[email protected]>"
> were not parsed properly.
>
> Try to improve the parsing so that the entries in the forms of:
> Proper Name <[email protected]> <[email protected]>
> and
> Proper Name <[email protected]> Commit Name <[email protected]>
> are transformed correctly.
>
> Signed-off-by: Joe Perches <[email protected]>
Yup. Looks good.
Reviewed-By: Florian Mickler <[email protected]>
> ---
> scripts/get_maintainer.pl | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
> index d29a8d7..eb2f1e6 100755
> --- a/scripts/get_maintainer.pl
> +++ b/scripts/get_maintainer.pl
> @@ -328,7 +328,8 @@ sub read_mailmap {
> # name1 <mail1> <mail2>
> # name1 <mail1> name2 <mail2>
> # (see man git-shortlog)
> - if (/^(.+)<(.+)>$/) {
> +
> + if (/^([^<]+)<([^>]+)>$/) {
> my $real_name = $1;
> my $address = $2;
>
> @@ -336,13 +337,13 @@ sub read_mailmap {
> ($real_name, $address) = parse_email("$real_name <$address>");
> $mailmap->{names}->{$address} = $real_name;
>
> - } elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) {
> + } elsif (/^<([^>]+)>\s*<([^>]+)>$/) {
> my $real_address = $1;
> my $wrong_address = $2;
>
> $mailmap->{addresses}->{$wrong_address} = $real_address;
>
> - } elsif (/^(.+)<([^\s]+)>\s*<([^\s]+)>$/) {
> + } elsif (/^(.+)<([^>]+)>\s*<([^>]+)>$/) {
> my $real_name = $1;
> my $real_address = $2;
> my $wrong_address = $3;
> @@ -353,7 +354,7 @@ sub read_mailmap {
> $mailmap->{names}->{$wrong_address} = $real_name;
> $mailmap->{addresses}->{$wrong_address} = $real_address;
>
> - } elsif (/^(.+)<([^\s]+)>\s*([^\s].*)<([^\s]+)>$/) {
> + } elsif (/^(.+)<([^>]+)>\s*(.+)\s*<([^>]+)>$/) {
> my $real_name = $1;
> my $real_address = $2;
> my $wrong_name = $3;
On 10/06/11 18:56, Alan Cox wrote:
> On Fri, 10 Jun 2011 11:55:49 +0900
> Paul Mundt<[email protected]> wrote:
>
>> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
>>> I no longer work at Bluewater Systems. Update my email address accordingly.
>>>
>> Is this sort of churn really necessary?
> Yes - stale email addresses cause all sorts of problems, particularly if
> in the future the address is re-used in the company. It also causes
> confusion over who owns and maintains stuff because it's never obvious
> whether the resolution of an unknown address is
>
> A. 'user has moved on, follow the user'
>
> B. 'user has moved on, company probably has someone else assigned
> to it'
Okay, so there seem to be a number of different opinions on this. I
would really like some solution for this so it can go into 3.0. The
options I see are:
a) My original patch
b) My original patch, but delete email address in .[ch] files rather
than change it
c) Entry in .mailmap (will this work for 3.0?)
d) Add MAINTAINERS entries for each of the files which have my email
address in them
e) Some combination of the above
Is there a preferred option? Who (Linus?) do I need to Cc to get this
included for 3.0?
Thanks,
~Ryan
On Tue, 2011-06-14 at 09:05 +1000, Ryan Mallon wrote:
> On 10/06/11 18:56, Alan Cox wrote:
> > On Fri, 10 Jun 2011 11:55:49 +0900
> > Paul Mundt<[email protected]> wrote:
> >> On Fri, Jun 10, 2011 at 09:12:50AM +1000, Ryan Mallon wrote:
> >>> I no longer work at Bluewater Systems. Update my email address accordingly.
> >> Is this sort of churn really necessary?
> > Yes - stale email addresses cause all sorts of problems, particularly if
> > in the future the address is re-used in the company. It also causes
> > confusion over who owns and maintains stuff because it's never obvious
> > whether the resolution of an unknown address is
> > A. 'user has moved on, follow the user'
> > B. 'user has moved on, company probably has someone else assigned
> > to it'
> Okay, so there seem to be a number of different opinions on this. I
> would really like some solution for this so it can go into 3.0. The
> options I see are:
> a) My original patch
> b) My original patch, but delete email address in .[ch] files rather
> than change it
> c) Entry in .mailmap (will this work for 3.0?)
It will if Andrew Morton/Linus picks up my patch.
> d) Add MAINTAINERS entries for each of the files which have my email
> address in them
> e) Some combination of the above
> Is there a preferred option?
My preferred combination is b and c.
If you're European, maybe a and c is best.