mailmap: add an entry for Oliver Hartkopp

hartkopp · marckleinebudde · commit 57769cb9ccba · 2024-12-23T12:39:12.000+01:00
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>
diff --git 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>

-Original file line number
+Diff line change
 Oleksij Rempel <[email protected]> <[email protected]>
 Oleksij Rempel <[email protected]>
 Oleksij Rempel <[email protected]> <[email protected]>
 +Oliver Hartkopp <[email protected]> <[email protected]>
 +Oliver Hartkopp <[email protected]> <[email protected]>
 Oliver Upton <[email protected]> <[email protected]>
 Ondřej Jirman <[email protected]> <[email protected]>
 Oza Pawandeep <[email protected]> <[email protected]>