]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
mailmap: add an entry for Oliver Hartkopp
authorOliver Hartkopp <socketcan@hartkopp.net>
Sat, 30 Nov 2024 17:08:34 +0000 (18:08 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 23 Dec 2024 11:39:12 +0000 (12:39 +0100)
Map my retired company address and an accidentally used personal
mail address within mailmap.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://patch.msgid.link/20241130170911.2828-1-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
.mailmap

index 5ff0e5d681e7cf72003ffb4274b9e8b64d6ef240..37ecf2632be38b91b848873962e7cc1dd2961ff0 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -529,6 +529,8 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
 Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
 Oleksij Rempel <o.rempel@pengutronix.de>
 Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
+Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>
+Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>
 Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
 OndÅ™ej Jirman <megi@xff.cz> <megous@megous.com>
 Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>