Matthias Fuchs's email isn't valid anymore. Use the newly created role
account instead.
Cc: [email protected]
Cc: Stefan Mätje <[email protected]>
Signed-off-by: Marc Kleine-Budde <[email protected]>
---
.mailmap | 1 +
1 file changed, 1 insertion(+)
diff --git a/.mailmap b/.mailmap
index a35ae244dfda..86a630d26cfb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -330,6 +330,7 @@ Shuah Khan <[email protected]> <[email protected]>
Shuah Khan <[email protected]> <[email protected]>
Simon Arlott <[email protected]> <[email protected]>
Simon Kelley <[email protected]>
+<[email protected]> <[email protected]>
Stéphane Witzmann <[email protected]>
Stephen Hemminger <[email protected]>
Steve Wise <[email protected]> <[email protected]>
--
2.30.2
Hello Marc,
I was not aware of the .mailmap file and its workings.
My question is should then also <[email protected]> be put in this
file because he is the co-author of the patch you're reviewing atm. and
his email address shows up in MODULE_AUTHOR() macro.
He also left our company already.
Am Freitag, den 06.08.2021, 12:48 +0200 schrieb Marc Kleine-Budde:
> Matthias Fuchs's email isn't valid anymore. Use the newly created role
> account instead.
>
> Cc: [email protected]
> Cc: Stefan Mätje <[email protected]>
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> ---
> .mailmap | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/.mailmap b/.mailmap
> index a35ae244dfda..86a630d26cfb 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -330,6 +330,7 @@ Shuah Khan <[email protected]> <[email protected]>
> Shuah Khan <[email protected]> <[email protected]>
> Simon Arlott <[email protected]> <[email protected]>
> Simon Kelley <[email protected]>
> +<[email protected]> <[email protected]>
> Stéphane Witzmann <[email protected]>
> Stephen Hemminger <[email protected]>
> Steve Wise <[email protected]> <[email protected]>
On 06.08.2021 15:07:43, Stefan Mätje wrote:
> I was not aware of the .mailmap file and its workings.
The mailmap file works on the git log, and thus tools using it: e.g.
scripts/get_maintainer.pl.
> My question is should then also <[email protected]> be put in this
> file
Probably yes, as there are two patches by him in the Linux kernel:
| Thomas Körper (2):
| can: dev: avoid calling kfree_skb() from interrupt context
| can: esd_usb2: Fix sparse warnings
I'll update this patch.
> because he is the co-author of the patch you're reviewing atm.
For co-authorship, use the Co-developed-by tag, that was recently added:
https://elixir.bootlin.com/linux/v5.12/source/Documentation/process/submitting-patches.rst#L449
Speaking of that patch. Can you please create an entry in the
MAINTAINERS file, too? I suggest to add yourself as M: and the
[email protected] 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.
> 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
regards,
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 |
Am Montag, den 09.08.2021, 09:24 +0200 schrieb Marc Kleine-Budde:
> On 06.08.2021 15:07:43, Stefan Mätje wrote:
> > I was not aware of the .mailmap file and its workings.
>
> The mailmap file works on the git log, and thus tools using it: e.g.
> scripts/get_maintainer.pl.
>
> > My question is should then also <[email protected]> be put in this
> > file
>
> Probably yes, as there are two patches by him in the Linux kernel:
>
> > Thomas Körper (2):
> > can: dev: avoid calling kfree_skb() from interrupt context
> > can: esd_usb2: Fix sparse warnings
>
> I'll update this patch.
>
> > because he is the co-author of the patch you're reviewing atm.
>
> For co-authorship, use the Co-developed-by tag, that was recently added:
>
> https://elixir.bootlin.com/linux/v5.12/source/Documentation/process/submitting-patches.rst#L449
I will do that.
> Speaking of that patch. Can you please create an entry in the
> MAINTAINERS file, too? I suggest to add yourself as M: and the
> [email protected] 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? I'm curious. Shouldn't there
be similar entries for the drivers from Vincent (drivers/net/can/usb/etas_es58x/)
and the PEAK driver family (drivers/net/can/peak_canfd/)? Why are they not there?
Have I misunderstood something?
diff --git a/MAINTAINERS b/MAINTAINERS
index 41fcfdb24a81..f25e3f79b392 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4111,6 +4111,14 @@ F: include/uapi/linux/can/error.h
F: include/uapi/linux/can/netlink.h
F: include/uapi/linux/can/vxcan.h
+CAN NETWORK DRIVERS ESD HARDWARE
+M: Stefan Mätje <[email protected]>
+R: [email protected]
+L: [email protected]
+S: Maintained
+F: drivers/net/can/esd/
+F: drivers/net/can/usb/esd_usb2.c
+
CAN NETWORK LAYER
M: Oliver Hartkopp <[email protected]>
M: Marc Kleine-Budde <[email protected]>
> > 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.
Best regards,
Stefan
On Fri, 2021-08-06 at 12:48 +0200, Marc Kleine-Budde wrote:
> Matthias Fuchs's email isn't valid anymore. Use the newly created role
> account instead.
>
> Cc: [email protected]
> Cc: Stefan M?tje <[email protected]>
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> ---
> ?.mailmap | 1 +
> ?1 file changed, 1 insertion(+)
>
> diff --git a/.mailmap b/.mailmap
> index a35ae244dfda..86a630d26cfb 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -330,6 +330,7 @@ Shuah Khan <[email protected]> <[email protected]>
> ?Shuah Khan <[email protected]> <[email protected]>
> ?Simon Arlott <[email protected]> <[email protected]>
> ?Simon Kelley <[email protected]>
> +<[email protected]> <[email protected]>
Please add a name not only the email address and place the entry
in alphabetical order by name.
> ?St?phane Witzmann <[email protected]>
> ?Stephen Hemminger <[email protected]>
> ?Steve Wise <[email protected]> <[email protected]>
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
> > [email protected] 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
> I'm curious. Shouldn't there be similar entries for the drivers from
> Vincent (drivers/net/can/usb/etas_es58x/) and the PEAK driver family
> (drivers/net/can/peak_canfd/)? Why are they not there?
They haven't included a MAINTAINERS entry in the patch series and I
forgot to enforce it :)
> Have I misunderstood something?
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 41fcfdb24a81..f25e3f79b392 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4111,6 +4111,14 @@ F: include/uapi/linux/can/error.h
> F: include/uapi/linux/can/netlink.h
> F: include/uapi/linux/can/vxcan.h
>
> +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.
> +M: Stefan Mätje <[email protected]>
> +R: [email protected]
> +L: [email protected]
> +S: Maintained
> +F: drivers/net/can/esd/
> +F: drivers/net/can/usb/esd_usb2.c
> +
> CAN NETWORK LAYER
> M: Oliver Hartkopp <[email protected]>
> M: Marc Kleine-Budde <[email protected]>
>
>
> > > 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 [email protected] 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 [email protected] email.
People tend to look at the source file in case of problems, so better
have working addresses there.
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.
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 |
On 09.08.2021 10:44:02, Joe Perches wrote:
> On Fri, 2021-08-06 at 12:48 +0200, Marc Kleine-Budde wrote:
> Please add a name not only the email address and place the entry
> in alphabetical order by name.
done, sent v3
regards,
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 |
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
> > > [email protected] 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 <[email protected]>
+R: [email protected]
+L: [email protected]
+S: Maintained
+F: drivers/net/can/esd/
+F: drivers/net/can/usb/esd_usb2.c
+
ET131X NETWORK DRIVER
M: Mark Einon <[email protected]>
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 [email protected] 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 [email protected] 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 <[email protected]>");
+MODULE_DESCRIPTION("Socket-CAN driver for esd CAN 402 card family with esdACC
core on PCIe");
+MODULE_AUTHOR("Thomas Körper <[email protected]>");
MODULE_AUTHOR("Stefan Mätje <[email protected]>");
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: [email protected]
_______________________________________
esd electronics gmbh
Vahrenwalder Str. 207
30165 Hannover
http://www.esd.eu
Quality Products – Made in Germany
_______________________________________
Register Hannover HRB 51373 - VAT-ID DE 115672832
General Manager: Klaus Detering
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
> > > > [email protected] 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 <[email protected]>
> +R: [email protected]
> +L: [email protected]
> +S: Maintained
> +F: drivers/net/can/esd/
> +F: drivers/net/can/usb/esd_usb2.c
> +
> ET131X NETWORK DRIVER
> M: Mark Einon <[email protected]>
> 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 [email protected] 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 [email protected] 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 <[email protected]>");
> +MODULE_DESCRIPTION("Socket-CAN driver for esd CAN 402 card family with esdACC
> core on PCIe");
> +MODULE_AUTHOR("Thomas Körper <[email protected]>");
> MODULE_AUTHOR("Stefan Mätje <[email protected]>");
> 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 |