| Message ID | 20180216104449.15546-1-boris.brezillon@bootlin.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
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@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@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@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@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@gmail.com> > >>>>> Ben Gardner <bgardner@wabtec.com> > >>>>> Ben M Cahill <ben.m.cahill@intel.com> > >>>>> Björn Steinbrink <B.Steinbrink@gmx.de> > >>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> > >>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com> > >>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com> > >>>>> +Boris Brezillon <boris.brezillon@bootlin.com> > >>>>> +Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@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.
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 <k.konieczny@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@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@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@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@gmail.com> >>>>>>> Ben Gardner <bgardner@wabtec.com> >>>>>>> Ben M Cahill <ben.m.cahill@intel.com> >>>>>>> Björn Steinbrink <B.Steinbrink@gmx.de> >>>>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> >>>>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com> >>>>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com> >>>>>>> +Boris Brezillon <boris.brezillon@bootlin.com> >>>>>>> +Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@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. I am newbie, it looks you are right, sorry for questions.
On Fri, 16 Feb 2018 16:35:27 +0100 Kamil Konieczny <k.konieczny@partner.samsung.com> wrote: > 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 <k.konieczny@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@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@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@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@gmail.com> > >>>>>>> Ben Gardner <bgardner@wabtec.com> > >>>>>>> Ben M Cahill <ben.m.cahill@intel.com> > >>>>>>> Björn Steinbrink <B.Steinbrink@gmx.de> > >>>>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> > >>>>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com> > >>>>>>> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com> > >>>>>>> +Boris Brezillon <boris.brezillon@bootlin.com> > >>>>>>> +Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@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. > > I am newbie, it looks you are right, sorry for questions. > No problem, but when you're not sure about something you should not act like you know how things should be done. Regards, Boris
On Fri, 16 Feb 2018 11:44:49 +0100 Boris Brezillon <boris.brezillon@bootlin.com> wrote: > Free Electrons is now Bootlin. > > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> > --- > Note that I'm planning to take this patch through the MTD tree. Applied to the nand/next branch of 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@gmail.com> > Ben Gardner <bgardner@wabtec.com> > Ben M Cahill <ben.m.cahill@intel.com> > Björn Steinbrink <B.Steinbrink@gmx.de> > -Boris Brezillon <boris.brezillon@free-electrons.com> > -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com> > -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com> > +Boris Brezillon <boris.brezillon@bootlin.com> > +Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com> > +Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com> > +Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com> > Brian Avery <b.avery@hp.com> > Brian King <brking@us.ibm.com> > Christoph Hellwig <hch@lst.de> > diff --git a/MAINTAINERS b/MAINTAINERS > index 34b2e9ed6d3d..38fcbabbc55b 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1232,7 +1232,7 @@ F: arch/arm/boot/dts/aspeed-* > F: drivers/*/*aspeed* > > ARM/ATMEL AT91 Clock Support > -M: Boris Brezillon <boris.brezillon@free-electrons.com> > +M: Boris Brezillon <boris.brezillon@bootlin.com> > S: Maintained > F: drivers/clk/at91 > > @@ -4644,7 +4644,7 @@ F: Documentation/gpu/meson.rst > T: git git://anongit.freedesktop.org/drm/drm-misc > > DRM DRIVERS FOR ATMEL HLCDC > -M: Boris Brezillon <boris.brezillon@free-electrons.com> > +M: Boris Brezillon <boris.brezillon@bootlin.com> > L: dri-devel@lists.freedesktop.org > S: Supported > F: drivers/gpu/drm/atmel-hlcdc/ > @@ -8412,7 +8412,7 @@ F: include/uapi/drm/armada_drm.h > F: Documentation/devicetree/bindings/display/armada/ > > MARVELL CRYPTO DRIVER > -M: Boris Brezillon <boris.brezillon@free-electrons.com> > +M: Boris Brezillon <boris.brezillon@bootlin.com> > M: Arnaud Ebalard <arno@natisbad.org> > F: drivers/crypto/marvell/ > S: Maintained > @@ -9034,7 +9034,7 @@ F: mm/ > MEMORY TECHNOLOGY DEVICES (MTD) > M: David Woodhouse <dwmw2@infradead.org> > M: Brian Norris <computersforpeace@gmail.com> > -M: Boris Brezillon <boris.brezillon@free-electrons.com> > +M: Boris Brezillon <boris.brezillon@bootlin.com> > M: Marek Vasut <marek.vasut@gmail.com> > M: Richard Weinberger <richard@nod.at> > M: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr> > @@ -9452,7 +9452,7 @@ S: Supported > F: drivers/net/ethernet/myricom/myri10ge/ > > NAND FLASH SUBSYSTEM > -M: Boris Brezillon <boris.brezillon@free-electrons.com> > +M: Boris Brezillon <boris.brezillon@bootlin.com> > R: Richard Weinberger <richard@nod.at> > L: linux-mtd@lists.infradead.org > W: http://www.linux-mtd.infradead.org/
diff --git a/.mailmap b/.mailmap index e18cab73e209..50c1d6bf36b2 100644 --- a/.mailmap +++ b/.mailmap @@ -33,9 +33,10 @@ Axel Lin <axel.lin@gmail.com> Ben Gardner <bgardner@wabtec.com> Ben M Cahill <ben.m.cahill@intel.com> Björn Steinbrink <B.Steinbrink@gmx.de> -Boris Brezillon <boris.brezillon@free-electrons.com> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com> -Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com> +Boris Brezillon <boris.brezillon@bootlin.com> +Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com> +Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com> +Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com> Brian Avery <b.avery@hp.com> Brian King <brking@us.ibm.com> Christoph Hellwig <hch@lst.de> diff --git a/MAINTAINERS b/MAINTAINERS index 34b2e9ed6d3d..38fcbabbc55b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1232,7 +1232,7 @@ F: arch/arm/boot/dts/aspeed-* F: drivers/*/*aspeed* ARM/ATMEL AT91 Clock Support -M: Boris Brezillon <boris.brezillon@free-electrons.com> +M: Boris Brezillon <boris.brezillon@bootlin.com> S: Maintained F: drivers/clk/at91 @@ -4644,7 +4644,7 @@ F: Documentation/gpu/meson.rst T: git git://anongit.freedesktop.org/drm/drm-misc DRM DRIVERS FOR ATMEL HLCDC -M: Boris Brezillon <boris.brezillon@free-electrons.com> +M: Boris Brezillon <boris.brezillon@bootlin.com> L: dri-devel@lists.freedesktop.org S: Supported F: drivers/gpu/drm/atmel-hlcdc/ @@ -8412,7 +8412,7 @@ F: include/uapi/drm/armada_drm.h F: Documentation/devicetree/bindings/display/armada/ MARVELL CRYPTO DRIVER -M: Boris Brezillon <boris.brezillon@free-electrons.com> +M: Boris Brezillon <boris.brezillon@bootlin.com> M: Arnaud Ebalard <arno@natisbad.org> F: drivers/crypto/marvell/ S: Maintained @@ -9034,7 +9034,7 @@ F: mm/ MEMORY TECHNOLOGY DEVICES (MTD) M: David Woodhouse <dwmw2@infradead.org> M: Brian Norris <computersforpeace@gmail.com> -M: Boris Brezillon <boris.brezillon@free-electrons.com> +M: Boris Brezillon <boris.brezillon@bootlin.com> M: Marek Vasut <marek.vasut@gmail.com> M: Richard Weinberger <richard@nod.at> M: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr> @@ -9452,7 +9452,7 @@ S: Supported F: drivers/net/ethernet/myricom/myri10ge/ NAND FLASH SUBSYSTEM -M: Boris Brezillon <boris.brezillon@free-electrons.com> +M: Boris Brezillon <boris.brezillon@bootlin.com> R: Richard Weinberger <richard@nod.at> L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/
Free Electrons is now Bootlin. Signed-off-by: Boris Brezillon <boris.brezillon@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(-)