Skip to content

Commit f1880f9

Browse files
HMS-stgrmarckleinebudde
authored andcommitted
can: peak: Modification of references to email accounts being deleted
With the upcoming deletion of @peak-system.com accounts and following the acquisition of PEAK-System and its brand by HMS-Networks, this fix aims to migrate all address references to @hms-networks.com, as well as to map my personal committer addresses to author addresses, while taking the opportunity to correct the accent on the first ‘e’ of my first name. Signed-off-by: Stéphane Grosjean <stephane.grosjean@hms-networks.com> Link: https://patch.msgid.link/20250912081820.86314-1-stephane.grosjean@free.fr Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent 4827dcc commit f1880f9

File tree

13 files changed

+32
-29
lines changed

13 files changed

+32
-29
lines changed

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
740740
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
741741
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
742742
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
743+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
744+
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
743745
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
744746
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
745747
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>

drivers/net/can/peak_canfd/peak_canfd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
3-
* Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
43
*
5-
* Copyright (C) 2016 PEAK System-Technik GmbH
4+
* Copyright (C) 2016-2025 PEAK System-Technik GmbH
5+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
66
*/
77

88
#include <linux/can.h>

drivers/net/can/peak_canfd/peak_canfd_user.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* SPDX-License-Identifier: GPL-2.0-only */
22
/* CAN driver for PEAK System micro-CAN based adapters
33
*
4-
* Copyright (C) 2003-2011 PEAK System-Technik GmbH
5-
* Copyright (C) 2011-2013 Stephane Grosjean <s.grosjean@peak-system.com>
4+
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
5+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
66
*/
77
#ifndef PEAK_CANFD_USER_H
88
#define PEAK_CANFD_USER_H

drivers/net/can/peak_canfd/peak_pciefd_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
3-
* Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
43
*
54
* Derived from the PCAN project file driver/src/pcan_pci.c:
65
*
7-
* Copyright (C) 2001-2006 PEAK System-Technik GmbH
6+
* Copyright (C) 2001-2025 PEAK System-Technik GmbH
7+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
88
*/
99

1010
#include <linux/kernel.h>
@@ -19,7 +19,7 @@
1919

2020
#include "peak_canfd_user.h"
2121

22-
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
22+
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
2323
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards");
2424
MODULE_LICENSE("GPL v2");
2525

drivers/net/can/sja1000/peak_pci.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
33
* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
4-
* Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
54
*
65
* Derived from the PCAN project file driver/src/pcan_pci.c:
76
*
8-
* Copyright (C) 2001-2006 PEAK System-Technik GmbH
7+
* Copyright (C) 2001-2025 PEAK System-Technik GmbH
8+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
99
*/
1010

1111
#include <linux/kernel.h>
@@ -22,7 +22,7 @@
2222

2323
#include "sja1000.h"
2424

25-
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
25+
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
2626
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");
2727
MODULE_LICENSE("GPL v2");
2828

drivers/net/can/sja1000/peak_pcmcia.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
3-
* Copyright (C) 2010-2012 Stephane Grosjean <s.grosjean@peak-system.com>
4-
*
53
* CAN driver for PEAK-System PCAN-PC Card
64
* Derived from the PCAN project file driver/src/pcan_pccard.c
7-
* Copyright (C) 2006-2010 PEAK System-Technik GmbH
5+
*
6+
* Copyright (C) 2006-2025 PEAK System-Technik GmbH
7+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
88
*/
99
#include <linux/kernel.h>
1010
#include <linux/module.h>
@@ -19,7 +19,7 @@
1919
#include <linux/can/dev.h>
2020
#include "sja1000.h"
2121

22-
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
22+
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
2323
MODULE_DESCRIPTION("CAN driver for PEAK-System PCAN-PC Cards");
2424
MODULE_LICENSE("GPL v2");
2525

drivers/net/can/usb/peak_usb/pcan_usb.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* CAN driver for PEAK System PCAN-USB adapter
44
* Derived from the PCAN project file driver/src/pcan_usb.c
55
*
6-
* Copyright (C) 2003-2010 PEAK System-Technik GmbH
7-
* Copyright (C) 2011-2012 Stephane Grosjean <s.grosjean@peak-system.com>
6+
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
7+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
88
*
99
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
1010
*/
@@ -919,7 +919,7 @@ static int pcan_usb_init(struct peak_usb_device *dev)
919919
CAN_CTRLMODE_LOOPBACK;
920920
} else {
921921
dev_info(dev->netdev->dev.parent,
922-
"Firmware update available. Please contact support@peak-system.com\n");
922+
"Firmware update available. Please contact support.peak@hms-networks.com\n");
923923
}
924924

925925
return 0;

drivers/net/can/usb/peak_usb/pcan_usb_core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* CAN driver for PEAK System USB adapters
44
* Derived from the PCAN project file driver/src/pcan_usb_core.c
55
*
6-
* Copyright (C) 2003-2010 PEAK System-Technik GmbH
7-
* Copyright (C) 2010-2012 Stephane Grosjean <s.grosjean@peak-system.com>
6+
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
7+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
88
*
99
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
1010
*/
@@ -24,7 +24,7 @@
2424

2525
#include "pcan_usb_core.h"
2626

27-
MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");
27+
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
2828
MODULE_DESCRIPTION("CAN driver for PEAK-System USB adapters");
2929
MODULE_LICENSE("GPL v2");
3030

drivers/net/can/usb/peak_usb/pcan_usb_core.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* CAN driver for PEAK System USB adapters
44
* Derived from the PCAN project file driver/src/pcan_usb_core.c
55
*
6-
* Copyright (C) 2003-2010 PEAK System-Technik GmbH
7-
* Copyright (C) 2010-2012 Stephane Grosjean <s.grosjean@peak-system.com>
6+
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
7+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
88
*
99
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
1010
*/

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/*
33
* CAN driver for PEAK System PCAN-USB FD / PCAN-USB Pro FD adapter
44
*
5-
* Copyright (C) 2013-2014 Stephane Grosjean <s.grosjean@peak-system.com>
5+
* Copyright (C) 2013-2025 PEAK System-Technik GmbH
6+
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
67
*/
78
#include <linux/ethtool.h>
89
#include <linux/module.h>

0 commit comments

Comments
 (0)