Messages in this thread Patches in this message | | | From | Stefan Mätje <> | Subject | Re: [PATCH] mailmap: update email address of Matthias Fuchs | Date | Thu, 12 Aug 2021 13:27:57 +0000 |
| |
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:
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@esd.eu> +R: socketcan@esd.eu +L: linux-can@vger.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@gmail.com> S: Odd Fixes
> > > > 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:
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@esd.eu>"); +MODULE_DESCRIPTION("Socket-CAN driver for esd CAN 402 card family with esdACC core on PCIe"); +MODULE_AUTHOR("Thomas Körper <socketcan@esd.eu>"); MODULE_AUTHOR("Stefan Mätje <stefan.maetje@esd.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.
-- Best regards,
Stefan Mätje System Design
Phone: +49-511-37298-146 E-Mail: stefan.maetje@esd.eu _______________________________________ esd electronics gmbh Vahrenwalder Str. 207 30165 Hannover www.esd.eu Quality Products – Made in Germany _______________________________________ Register Hannover HRB 51373 - VAT-ID DE 115672832 General Manager: Klaus Detering
| |