NEWS: update mailmap to bring NEWS and "make git-contrib" in line

Let's make sure that "make git-contrib" prints a useful contributors list
directly useful for NEWS and fixes up contributors's IDs a bit.

diff --git a/.mailmap b/.mailmap
index c05b3b9..d56fb67 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -70,3 +70,7 @@ Otto Wallenius <otto_026@hotmail.com>
 Tom Yan <tom.ty89@gmail.com>
 Marty Plummer <ntzrmtthihu777@gmail.com>
 Brian Boylston <brian.boylston@hpe.com>
+Thomas H. P. Andersen <phomes@gmail.com>
+Michael Olbrich <m.olbrich@pengutronix.de>
+Douglas Christman <DouglasChristman@gmail.com>
+Alexander Kuleshov <kuleshovmail@gmail.com> <0xAX@users.noreply.github.com>

diff --git a/NEWS b/NEWS
index 101cd77..928ed52 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -205,12 +205,12 @@ CHANGES WITH 231:
           local changes made to systemd in a pristine, defined environment. See
           HACKING for details.
 
-        Contributions from: Alessandro Puccetti, Alessio Igor Bogani,
-        Alexander Kuleshov, Alexander Kurtz, Alex Gaynor, Andika Triwidada,
-        Andreas Pokorny, Andreas Rammhold, Andrew Jeddeloh, Ansgar Burchardt,
-        Atrotors, Benjamin Drung, Brian Boylston, Christian Hesse, Christian
-        Rebischke, Daniele Medri, Daniel Mack, Dave Reisner, David Herrmann,
-        David Michael, Djalal Harouni, Doug Christman, Elias Probst, Evgeny
+        Contributions from: Alessandro Puccetti, Alessio Igor Bogani, Alexander
+        Kuleshov, Alexander Kurtz, Alex Gaynor, Andika Triwidada, Andreas
+        Pokorny, Andreas Rammhold, Andrew Jeddeloh, Ansgar Burchardt, Atrotors,
+        Benjamin Drung, Brian Boylston, Christian Hesse, Christian Rebischke,
+        Daniele Medri, Daniel Mack, Dave Reisner, David Herrmann, David
+        Michael, Djalal Harouni, Douglas Christman, Elias Probst, Evgeny
         Vereshchagin, Federico Mena Quintero, Felipe Sateler, Franck Bui,
         Harald Hoyer, Ian Lee, Ivan Shapovalov, Jakub Wilk, Jan Janssen,
         Jean-Sébastien Bour, John Paul Adrian Glaubitz, Jouke Witteveen, Kai