meta: consolidate email addresses for szmarczak

Trott · danielleadams · commit aaab2095db3a · 2021-08-16T16:35:19.000-04:00
PR-URL: #39651 Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -386,6 +386,7 @@ Stewart X Addison <sxa@redhat.com> <sxa@uk.ibm.com>
 Suraiya Hameed <hameedsuraiya@gmail.com>
 Suramya shah <shah.suramya@gmail.com> <ss22ever@users.noreply.github.com>
 Surya Panikkal <surya.com@gmail.com>
+Szymon Marczak <sz.marczak@gmail.com> <36894700+szmarczak@users.noreply.github.com>
 Tadashi SAWADA <cesare@mayverse.jp>
 Tadhg Creedon <tadhgcreedon@gmail.com> <tadhg.creedon@rangle.io>
 Taehee Kang <hugnosis@gmail.com>
diff --git a/AUTHORS b/AUTHORS
@@ -3165,7 +3165,6 @@ krank2me <alejok6@gmail.com>
 masx200 <34191203+masx200@users.noreply.github.com>
 Baruch Odem (Rothkoff) <baruchiro@gmail.com>
 Mattias Runge-Broberg <mattias@runge.se>
-Szymon Marczak <36894700+szmarczak@users.noreply.github.com>
 Dmitry Semigradsky <semigradskyd@gmail.com>
 Ole André Vadla Ravnås <oleavr@gmail.com>
 Aleksandr Krutko <Oleksandr.Krutko@ibm.com>

-Original file line number
+Diff line change
 Suraiya Hameed <[email protected]>
 Suramya shah <[email protected]> <[email protected]>
 Surya Panikkal <[email protected]>
 +Szymon Marczak <[email protected]> <[email protected]>
 Tadashi SAWADA <[email protected]>
 Tadhg Creedon <[email protected]> <[email protected]>
 Taehee Kang <[email protected]>
-Original file line number
+Diff line change
 masx200 <[email protected]>
 Baruch Odem (Rothkoff) <[email protected]>
 Mattias Runge-Broberg <[email protected]>
 -Szymon Marczak <[email protected]>
 Dmitry Semigradsky <[email protected]>
 Ole André Vadla Ravnås <[email protected]>
 Aleksandr Krutko <[email protected]>