Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
.mailmap: Combine more (name, email) to individual persons
.mailmap: update long-lost friends with multiple defunct addresses

diff --combined .mailmap
index 840abf7cba28980495c7cf408540684be10e7150,0d062d7de629c4bd2c2b6241fb0b906d177d179a..1c1f5ec6bf83ca9dd27f7dacaa05b722202e115b
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -18,10 -18,14 +18,14 @@@ Alexey Shumkin <alex.crezoff@gmail.com
  Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
  Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
  Aneesh Kumar K.V <aneesh.kumar@gmail.com>
+ Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
+ Amos Waterland <apw@debian.org> <apw@us.ibm.com>
  Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
+ Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
  Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
  Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
- Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+ brian m. carlson <sandals@crustytoothpaste.ath.cx> Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+ brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net>
  Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
  Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
  Cheng Renquan <crquan@gmail.com>
@@@ -34,6 -38,8 +38,8 @@@ Dan Johnson <computerdruid@gmail.com
  Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
  Dana L. How <danahow@gmail.com> Dana How
  Daniel Barkalow <barkalow@iabervon.org>
+ Daniel Trstenjak <daniel.trstenjak@gmail.com> <daniel.trstenjak@online.de>
+ Daniel Trstenjak <daniel.trstenjak@gmail.com> <trsten@science-computing.de>
  David Brown <git@davidb.org> <davidb@quicinc.com>
  David D. Kilzer <ddkilzer@kilzer.net>
  David Kågedal <davidk@lysator.liu.se>
@@@ -68,11 -74,17 +74,17 @@@ J. Bruce Fields <bfields@citi.umich.edu
  J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
  Jakub Narębski <jnareb@gmail.com>
  James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
+ # The 2 following authors are probably the same person,
+ # but both emails bounce.
+ Jason McMullan <jason.mcmullan@timesys.com>
+ Jason McMullan <mcmullan@netapp.com>
  Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
  Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
  Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
  Jeff King <peff@peff.net> <peff@github.com>
  Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
+ Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
+ Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
  Jim Meyering <jim@meyering.net> <meyering@redhat.com>
  Joachim Berdal Haga <cjhaga@fys.uio.no>
  Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
@@@ -144,7 -156,7 +156,7 @@@ Michele Ballabio <barra_cuda@katamail.c
  Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
  Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
  Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
- Nanako Shiraishi <nanako3@bluebottle.com>
+ Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
  Nanako Shiraishi <nanako3@lavabit.com>
  Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
  Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
@@@ -172,11 -184,13 +184,13 @@@ Philipp A. Hartmann <pah@qo.cx> <ph@sor
  Philippe Bruhat <book@cpan.org>
  Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
  Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 -René Scharfe <rene.scharfe@lsrfire.ath.cx>
 +René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
  Robert Fitzsimons <robfitz@273k.net>
  Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
  Robert Zeh <robert.a.zeh@gmail.com>
  Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
+ Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <rutger@nospam.com>
+ Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <git@tux.tmfweb.nl>
  Ryan Anderson <ryan@michonline.com> <rda@google.com>
  Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
  Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>