From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 16 Feb 2018 15:54:55 +0100 From: Boris Brezillon To: Kamil Konieczny Cc: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen , linux-mtd@lists.infradead.org, Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org, Mike Turquette , Stephen Boyd , linux-clk@vger.kernel.org, David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Update Boris Brezillon email address Message-ID: <20180216155455.36168609@bbrezillon> In-Reply-To: <138ed639-992d-2d87-4dd4-973323cdcad7@partner.samsung.com> References: <20180216104449.15546-1-boris.brezillon@bootlin.com> <20180216121619.3edad6fb@bbrezillon> <4086d3a7-c79d-6906-2778-caccd647ffe6@partner.samsung.com> <20180216150050.6051cc26@bbrezillon> <138ed639-992d-2d87-4dd4-973323cdcad7@partner.samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 List-ID: Adding back all the people that were Cc-ed on the initial email. On Fri, 16 Feb 2018 15:18:21 +0100 Kamil Konieczny wrote: > On 16.02.2018 15:00, Boris Brezillon wrote: > > On Fri, 16 Feb 2018 12:21:53 +0100 > > Kamil Konieczny wrote: > > =20 > >> On 16.02.2018 12:16, Boris Brezillon wrote: =20 > >>> On Fri, 16 Feb 2018 12:07:42 +0100 > >>> Kamil Konieczny wrote: > >>> =20 > >>>> On 16.02.2018 11:44, Boris Brezillon wrote: =20 > >>>>> Free Electrons is now Bootlin. > >>>>> > >>>>> Signed-off-by: Boris Brezillon > >>>>> --- > >>>>> 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 > >>>>> Ben Gardner > >>>>> Ben M Cahill > >>>>> Bj=C3=B6rn Steinbrink > >>>>> -Boris Brezillon > >>>>> -Boris Brezillon > >>>>> -Boris Brezillon > >>>>> +Boris Brezillon > >>>>> +Boris Brezillon =20 > >>>> > >>>> ------------------------------------------------------------------ ?= ????????????????? =20 > >>> > >>> Is there a problem with this line? > >>> =20 > >> > >> I think you want to delete all 'free-electrons', yet here you add this= =20 > >=20 > > 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. > >=20 > > [1]https://git-scm.com/docs/git-shortlog > > =20 >=20 > 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 >=20 > sed -i -e 's/free-electrons/bootlin/g' .mailmap >=20 > Please just resend this with patch for MAINTAINER's only >=20 .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. --=20 Boris Brezillon, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com