[PATCH] Update Boris Brezillon email address

[Boris Brezillon]

Adding back all the people that were Cc-ed on the initial email.

On Fri, 16 Feb 2018 15:18:21 +0100
Kamil Konieczny <k.konieczny at partner.samsung.com> wrote:

> On 16.02.2018 15:00, Boris Brezillon wrote:
> > On Fri, 16 Feb 2018 12:21:53 +0100
> > Kamil Konieczny <k.konieczny at partner.samsung.com> wrote:
> >   
> >> On 16.02.2018 12:16, Boris Brezillon wrote:  
> >>> On Fri, 16 Feb 2018 12:07:42 +0100
> >>> Kamil Konieczny <k.konieczny at partner.samsung.com> wrote:
> >>>     
> >>>> On 16.02.2018 11:44, Boris Brezillon wrote:    
> >>>>> Free Electrons is now Bootlin.
> >>>>>
> >>>>> Signed-off-by: Boris Brezillon <boris.brezillon at bootlin.com>
> >>>>> ---
> >>>>> Note that I'm planning to take this patch through the MTD tree.
> >>>>> ---
> >>>>>  .mailmap    |  7 ++++---
> >>>>>  MAINTAINERS | 10 +++++-----
> >>>>>  2 files changed, 9 insertions(+), 8 deletions(-)
> >>>>>
> >>>>> diff --git a/.mailmap b/.mailmap
> >>>>> index e18cab73e209..50c1d6bf36b2 100644
> >>>>> --- a/.mailmap
> >>>>> +++ b/.mailmap
> >>>>> @@ -33,9 +33,10 @@ Axel Lin <axel.lin at gmail.com>
> >>>>>  Ben Gardner <bgardner at wabtec.com>
> >>>>>  Ben M Cahill <ben.m.cahill at intel.com>
> >>>>>  Björn Steinbrink <B.Steinbrink at gmx.de>
> >>>>> -Boris Brezillon <boris.brezillon at free-electrons.com>
> >>>>> -Boris Brezillon <boris.brezillon at free-electrons.com> <b.brezillon.dev at gmail.com>
> >>>>> -Boris Brezillon <boris.brezillon at free-electrons.com> <b.brezillon at overkiz.com>
> >>>>> +Boris Brezillon <boris.brezillon at bootlin.com>
> >>>>> +Boris Brezillon <boris.brezillon at bootlin.com> <boris.brezillon at free-electrons.com>      
> >>>>
> >>>> ------------------------------------------------------------------ ??????????????????    
> >>>
> >>> Is there a problem with this line?
> >>>     
> >>
> >> I think you want to delete all 'free-electrons', yet here you add this  
> > 
> > I'm clearly not a git expert, but according to man git-shortlog [1], the
> > format I'm using here allows mailmap to replace the old email by the
> > new one, which is exactly what I want.
> > 
> > [1]https://git-scm.com/docs/git-shortlog
> >   
> 
> Ah, I see, but why do you send patch for .mailmap ?
> it is your private file, not global one, I do not want mine .mailmap
> to be replaced by yours :)

No, it's not private, it's part of the git tree.

> But beside this, you can use sed script
> 
> sed -i -e 's/free-electrons/bootlin/g' .mailmap
> 
> Please just resend this with patch for MAINTAINER's only
> 

.mailmap is versioned for a good reason, and I don't see why I couldn't
update entries for my emails, especially since those entries already
existed before this patch.

-- 
Boris Brezillon, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com