From: "Stefan Mätje" <Stefan.Maetje@esd.eu>
To: "mkl@pengutronix.de" <mkl@pengutronix.de>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Subject: Re: [PATCH] mailmap: update email address of Matthias Fuchs
Date: Thu, 12 Aug 2021 13:27:57 +0000 [thread overview]
Message-ID: <10975691377830c5fa647918b07fd8c5adf7483b.camel@esd.eu> (raw)
In-Reply-To: <20210809175158.5xdkqeemjo3hqwcw@pengutronix.de>
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
next prev parent reply other threads:[~2021-08-12 13:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 10:48 [PATCH] mailmap: update email address of Matthias Fuchs Marc Kleine-Budde
2021-08-06 15:07 ` Stefan Mätje
2021-08-09 7:24 ` Marc Kleine-Budde
2021-08-09 17:22 ` Stefan Mätje
2021-08-09 17:51 ` Marc Kleine-Budde
2021-08-12 13:27 ` Stefan Mätje [this message]
2021-08-12 13:39 ` Marc Kleine-Budde
2021-08-09 17:44 ` Joe Perches
2021-08-09 17:59 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10975691377830c5fa647918b07fd8c5adf7483b.camel@esd.eu \
--to=stefan.maetje@esd.eu \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).