linux-kernel - Re: [PATCH] mailmap: update email address of Matthias Fuchs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210812133911.ewv2ge474gdxuuwf@pengutronix.de>
Date:   Thu, 12 Aug 2021 15:39:11 +0200
From:   Marc Kleine-Budde <mkl@...gutronix.de>
To:     Stefan Mätje <Stefan.Maetje@....eu>
Cc:     "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "linux-can@...r.kernel.org" <linux-can@...r.kernel.org>
Subject: Re: [PATCH] mailmap: update email address of Matthias Fuchs

On 12.08.2021 13:27:57, Stefan Mätje wrote:
> Am Montag, den 09.08.2021, 19:51 +0200 schrieb Marc Kleine-Budde:
> > On 09.08.2021 17:22:51, Stefan Mätje wrote:
> > > > Speaking of that patch. Can you please create an entry in the
> > > > MAINTAINERS file, too? I suggest to add yourself as M: and the
> > > > socketcan@e.u as R:. The change in the MAINTAINERS file will be a second
> > > > patch in that series. Just include it the next iteration of that series.
> > > 
> > > Do you think of something like the patch below?
> > 
> > ACK
> :
> > >  
> > > +CAN NETWORK DRIVERS ESD HARDWARE
> > 
> > This usually starts with the company's name or the driver name, so
> > something like "ESD PCIe/402 CAN DRIVER" and a separate entry for the
> > USB driver or "ESD CAN NETWORK DRIVERS" if you want to have a single
> > entry.
> 
> Following the requirement to start with the company's name I'll include this
> patch for MAINTAINERS:

not a requirement, but usually done :)

> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 41fcfdb24a81..8ad40b5d082e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -6900,6 +6900,14 @@ S:       Maintained
>  F:     include/linux/errseq.h
>  F:     lib/errseq.c
>  
> +ESD CAN NETWORK DRIVERS
> +M:     Stefan Mätje <stefan.maetje@....eu>
> +R:     socketcan@....eu
> +L:     linux-can@...r.kernel.org
> +S:     Maintained
> +F:     drivers/net/can/esd/
> +F:     drivers/net/can/usb/esd_usb2.c
> +
>  ET131X NETWORK DRIVER
>  M:     Mark Einon <mark.einon@...il.com>
>  S:     Odd Fixes
> 

Fine! Adding this to the MAINTAINERS should be a separate patch in the series.

> > > > > and his email address shows up in MODULE_AUTHOR() macro. He also left
> > > > > our company already.
> > > > 
> > > > In newly added changes, it makes sense that all email addresses are
> > > > working. :D
> > > 
> > > So I'll remove his stale email address together with the
> > > MODULE_AUTHOR() macro and file the authorship credits in a changed
> > > copyright history at the top of the source files.
> > 
> > Yes, his name but with the socketcan@e.u email in MODULE_AUTHOR().
> > Regarding the top of the file's copyright information, the last patch
> > only mentions 2 iterations of "esd" but no "real" people nor email
> > addresses. I don't know what's you company's policy for the copyright
> > line is, I don't mind adding Thomas, but use the socketcan@e.u email.
> > People tend to look at the source file in case of problems, so better
> > have working addresses there.
> > 
> 
> For the MODULE_AUTHOR() stuff and the copyright notices I will change it
> like this:

Looks good! Squash into the patch where the file is added.

> diff --git a/drivers/net/can/esd/esd_402_pci-core.c
> b/drivers/net/can/esd/esd_402_pci-core.c
> index 191e7f45c5d9..50d9c1dd1197 100644
> --- a/drivers/net/can/esd/esd_402_pci-core.c
> +++ b/drivers/net/can/esd/esd_402_pci-core.c
> @@ -1,6 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0-only
> -/* Copyright (C) 2015 - 2017 esd electronic system design gmbh
> - * Copyright (C) 2017 - 2021 esd electronics gmbh
> +/* Copyright (C) 2015 - 2016 Thomas Körper, esd electronic system design gmbh
> + * Copyright (C) 2017 - 2021 Stefan Mätje, esd electronics gmbh
>   */
>  
>  #include <linux/kernel.h>
> @@ -524,7 +524,7 @@ static struct pci_driver pci402_driver = {
>  
>  module_pci_driver(pci402_driver);
>  
> -MODULE_DESCRIPTION("Socket-CAN driver for esd CAN PCI(e)/402 cards");
> -MODULE_AUTHOR("Thomas Körper <thomas.koerper@....eu>");
> +MODULE_DESCRIPTION("Socket-CAN driver for esd CAN 402 card family with esdACC
> core on PCIe");
> +MODULE_AUTHOR("Thomas Körper <socketcan@....eu>");
>  MODULE_AUTHOR("Stefan Mätje <stefan.maetje@....eu>");
>  MODULE_LICENSE("GPL");
> 
> 
> > Regarding the Co-Developed and Signed-off-by: Thomas posted the patches
> > back in 2015 with his email address, so use it for the Co-Developed and
> > Signed-off-by in your patch, too. This seems (or is) a bit inconsistent,
> > but the S-o-b's should record the history of the patch.
> 
> I'll add this in the next iteration of my driver patch as recommended.

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)