From: Kamil Konieczny Subject: Re: [PATCH] Update Boris Brezillon email address Date: Fri, 16 Feb 2018 16:35:27 +0100 Message-ID: <9c05d969-b488-fbc4-4143-6446d8a6d7ab@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> <20180216155455.36168609@bbrezillon> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Cc: David Woodhouse , Brian Norris , 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 To: Boris Brezillon Return-path: Received: from mailout2.w1.samsung.com ([210.118.77.12]:45982 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865AbeBPPfd (ORCPT ); Fri, 16 Feb 2018 10:35:33 -0500 In-reply-to: <20180216155455.36168609@bbrezillon> Content-language: en-US Sender: linux-crypto-owner@vger.kernel.org List-ID: On 16.02.2018 15:54, Boris Brezillon wrote: > 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: >>> >>>> On 16.02.2018 12:16, Boris Brezillon wrote: >>>>> On Fri, 16 Feb 2018 12:07:42 +0100 >>>>> Kamil Konieczny wrote: >>>>> >>>>>> On 16.02.2018 11:44, Boris Brezillon wrote: >>>>>>> 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örn Steinbrink >>>>>>> -Boris Brezillon >>>>>>> -Boris Brezillon >>>>>>> -Boris Brezillon >>>>>>> +Boris Brezillon >>>>>>> +Boris Brezillon >>>>>> >>>>>> ------------------------------------------------------------------ ?????????????????? >>>>> >>>>> 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. I am newbie, it looks you are right, sorry for questions. -- Best regards, Kamil Konieczny Samsung R&D Institute Poland