[B.A.T.M.A.N.] batman patch authorship mangled

[B.A.T.M.A.N.] batman patch authorship mangled

[Marek Lindner]

Hi Greg,

the last patchset sent by Andrew contained a few errors regarding the 
authorship due to incorrect handling on our side. We did not notice these 
issues until the patches went out to get included by you.

Here is the complete list of incorrect assignments:
 * should be Linus instead of Simon
 => [PATCH 07/26] staging:batman-adv: Remove dead max addr and obsolete 
VIS_FORMAT strings
 => [PATCH 09/26] staging:batman-adv: Update README about vis raw output

 * should be Luis instead of Marek
 => [PATCH 12/26] staging:batman-adv: fix whitespace style issues

 * should be Sven instead of Marek
 => [PATCH 24/26] staging:batman-adv: Fix whitespace problems criticized by 
checkpatch.pl
 => [PATCH 25/26] staging:batman-adv: Reduce max characters on a line to 80

Is there any way to correct the authors of the patches in question ? I know 
that modifying the git history to fix the author will change all following 
hashes and everyone has to rebase its tree.
Personally, I'm not so worried about Linus & Sven, since they are longterm 
contributors and somewhat close to the project. I'm sure a beer or two can 
compensate them for the loss of fame. Luis on the other hand seemed to be 
quite thrilled about getting his patch in and I'd rather not leave him with 
the impression we don't want to credit him for his work.

Regards,
Marek

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Greg KH]

On Fri, May 07, 2010 at 10:43:11PM +0800, Marek Lindner wrote:
> 
> Hi Greg,
> 
> the last patchset sent by Andrew contained a few errors regarding the 
> authorship due to incorrect handling on our side. We did not notice these 
> issues until the patches went out to get included by you.

Ick.

> Here is the complete list of incorrect assignments:
>  * should be Linus instead of Simon
>  => [PATCH 07/26] staging:batman-adv: Remove dead max addr and obsolete 
> VIS_FORMAT strings
>  => [PATCH 09/26] staging:batman-adv: Update README about vis raw output
> 
>  * should be Luis instead of Marek
>  => [PATCH 12/26] staging:batman-adv: fix whitespace style issues
> 
>  * should be Sven instead of Marek
>  => [PATCH 24/26] staging:batman-adv: Fix whitespace problems criticized by 
> checkpatch.pl
>  => [PATCH 25/26] staging:batman-adv: Reduce max characters on a line to 80
> 
> Is there any way to correct the authors of the patches in question ? I know 
> that modifying the git history to fix the author will change all following 
> hashes and everyone has to rebase its tree.
> Personally, I'm not so worried about Linus & Sven, since they are longterm 
> contributors and somewhat close to the project. I'm sure a beer or two can 
> compensate them for the loss of fame. Luis on the other hand seemed to be 
> quite thrilled about getting his patch in and I'd rather not leave him with 
> the impression we don't want to credit him for his work.

Hm, ok, I'll try to rebase the whole tree :(

Can you resend me the set of 26 patches with the correct authorship set
so I know I get it right?

thanks,

greg k-h

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Marek Lindner]

On Friday 07 May 2010 23:26:06 Greg KH wrote:
> Hm, ok, I'll try to rebase the whole tree :(
> 
> Can you resend me the set of 26 patches with the correct authorship set
> so I know I get it right?

Many thanks! You will receive the fixed patchset shortly.

Seems we have to send the beer to you or hand it over personally,
Marek

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Luis de Bethencourt]

On Fri, May 7, 2010 at 4:26 PM, Greg KH <greg@kroah.com> wrote:
> On Fri, May 07, 2010 at 10:43:11PM +0800, Marek Lindner wrote:
>>
>> Hi Greg,
>>
>> the last patchset sent by Andrew contained a few errors regarding the
>> authorship due to incorrect handling on our side. We did not notice these
>> issues until the patches went out to get included by you.
>
> Ick.
>
>> Here is the complete list of incorrect assignments:
>>  * should be Linus instead of Simon
>>  => [PATCH 07/26] staging:batman-adv: Remove dead max addr and obsolete
>> VIS_FORMAT strings
>>  => [PATCH 09/26] staging:batman-adv: Update README about vis raw output
>>
>>  * should be Luis instead of Marek
>>  => [PATCH 12/26] staging:batman-adv: fix whitespace style issues
>>
>>  * should be Sven instead of Marek
>>  => [PATCH 24/26] staging:batman-adv: Fix whitespace problems criticized by
>> checkpatch.pl
>>  => [PATCH 25/26] staging:batman-adv: Reduce max characters on a line to 80
>>
>> Is there any way to correct the authors of the patches in question ? I know
>> that modifying the git history to fix the author will change all following
>> hashes and everyone has to rebase its tree.
>> Personally, I'm not so worried about Linus & Sven, since they are longterm
>> contributors and somewhat close to the project. I'm sure a beer or two can
>> compensate them for the loss of fame. Luis on the other hand seemed to be
>> quite thrilled about getting his patch in and I'd rather not leave him with
>> the impression we don't want to credit him for his work.
>
> Hm, ok, I'll try to rebase the whole tree :(
>
> Can you resend me the set of 26 patches with the correct authorship set
> so I know I get it right?
>
> thanks,
>
> greg k-h
>

Greg, wait!

No need for this. I understand the problem, can imagine why it
happened and I don't mind the wrong authorship. I prefer avoiding the
general head-ache of rebasing the whole tree.

To be honest I noticed this in yesterday's emails but I decided to not
mention it.

Marek,
Any beers for me then :P

Huge thanks to you both.

Luis

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Andrew Lunn]

> Greg, wait!
> 
> No need for this. I understand the problem, can imagine why it
> happened and I don't mind the wrong authorship. I prefer avoiding the
> general head-ache of rebasing the whole tree.
> 
> To be honest I noticed this in yesterday's emails but I decided to not
> mention it.
> 
> Marek,
> Any beers for me then :P

So, i will wait until somebody has time to visit the post office and
work out which is cheaper: Beer to Greg, or Beer to Luis.

     Andrew

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Luis de Bethencourt]

On Fri, May 7, 2010 at 6:56 PM, Andrew Lunn <andrew@lunn.ch> wrote:
>> Greg, wait!
>>
>> No need for this. I understand the problem, can imagine why it
>> happened and I don't mind the wrong authorship. I prefer avoiding the
>> general head-ache of rebasing the whole tree.
>>
>> To be honest I noticed this in yesterday's emails but I decided to not
>> mention it.
>>
>> Marek,
>> Any beers for me then :P
>
> So, i will wait until somebody has time to visit the post office and
> work out which is cheaper: Beer to Greg, or Beer to Luis.
>
>     Andrew
>

Make it for Greg :)

Luis

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Greg KH]

On Fri, May 07, 2010 at 07:54:36PM +0100, Luis de Bethencourt wrote:
> On Fri, May 7, 2010 at 6:56 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> >> Greg, wait!
> >>
> >> No need for this. I understand the problem, can imagine why it
> >> happened and I don't mind the wrong authorship. I prefer avoiding the
> >> general head-ache of rebasing the whole tree.
> >>
> >> To be honest I noticed this in yesterday's emails but I decided to not
> >> mention it.
> >>
> >> Marek,
> >> Any beers for me then :P
> >
> > So, i will wait until somebody has time to visit the post office and
> > work out which is cheaper: Beer to Greg, or Beer to Luis.
> >
> >     Andrew
> >
> 
> Make it for Greg :)

Ok, I've rebased the staging-next tree on 2.6.34-rc6, reapplied the
patches, and then took your 26 patches and applied them and pushed
everything out.

Can someone verify that I got it all correct?

Oh, and you owe me one bottle of "Tactical Nuclear Penguin" :)

thanks,

greg k-h

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Sven Eckelmann]

[-- Attachment #1: Type: Text/Plain, Size: 338 bytes --]

Greg KH wrote:
[..]
> Ok, I've rebased the staging-next tree on 2.6.34-rc6, reapplied the
> patches, and then took your 26 patches and applied them and pushed
> everything out.
> 
> Can someone verify that I got it all correct?

Checked the content and the log - looks fine too me. Thanks a lot

Kind regards,
	Sven Eckelmann

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [B.A.T.M.A.N.] batman patch authorship mangled

[Luis de Bethencourt]

On Tue, May 11, 2010 at 11:28 PM, Sven Eckelmann <sven.eckelmann@gmx.de> wrote:
> Greg KH wrote:
> [..]
>> Ok, I've rebased the staging-next tree on 2.6.34-rc6, reapplied the
>> patches, and then took your 26 patches and applied them and pushed
>> everything out.
>>
>> Can someone verify that I got it all correct?
>
> Checked the content and the log - looks fine too me. Thanks a lot
>
> Kind regards,
>        Sven Eckelmann
>

Thanks!

Luis