Fix Michael Tokarev email address in the following commits:

  $ git log --committer=mjt@gandalf --oneline
  eb83c2030a hw/net/e1000e: Fix compiler warning
  5ce747cfac target-m68k: fix get_mac_extf helper
  3224e8786f timer/cpus: fix some typos and update some comments
  04ecbb7834 timer.h: fix inconsistency between comment and function prototype
  083b96e221 timer.h: fix typo
  e2f310ec38 maint: Ignore generated version file
  32945472ce Document that curses usually needs -k option too
  deff0ddb86 trace-event: display "%d" instead of "0x%d"
  8223f345b9 linux-user, trivial: display "0x%x" instead of "0x%d"
  8928473699 pic: fix typo in error message: KVM_GET_IRQCHIP -> KVM_SET_IRQCHIP
  a337f295de sparc: Use g_memdup() instead of g_new0() + memcpy()
  bc82585a8f vl: remove unnecessary duplicate call to tpm_cleanup
  39cba610a7 arm: spelling fix: mismatch
  0aadb5a15f hw/dma/omap: spelling fix: endianness
  270a4b6739 hw/bt/hci: spelling fix: endianness
  37e3645ad3 docs: Fix description of the leaky bucket algorithm in throttle.txt

Cc: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index eaed43a178..9bc80771e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -131,6 +131,7 @@ Marek Dolata <mkdolata@us.ibm.com>
 Michael Avdienko <whitearchey@gmail.com>
 Michael S. Tsirkin <mst@redhat.com>
 Michael S. Tsirkin <mst@redhat.com> <mst@robin.(none)>
+Michael Tokarev <mjt@tls.msk.ru> <mjt@gandalf>
 Munkyu Im <munkyu.im@samsung.com>
 Nicholas Bellinger <nab@linux-iscsi.org>
 Nicholas Thomas <nick@bytemark.co.uk>
-- 
2.21.3

02.07.2020 20:38, Philippe Mathieu-Daudé wrote:
> Fix Michael Tokarev email address in the following commits:
> 
>   $ git log --committer=mjt@gandalf --oneline

Heh. It was a misconfiguration on my part which I haven't noticed
for quite some time.  Dunno if it's worth the effort to fix that
now, since all the commits are old (in 2016), and all are trivial.

/mjt

+Alex/Laurent

On 7/2/20 8:45 PM, Michael Tokarev wrote:
> 02.07.2020 20:38, Philippe Mathieu-Daudé wrote:
>> Fix Michael Tokarev email address in the following commits:
>>
>>   $ git log --committer=mjt@gandalf --oneline
> 
> Heh. It was a misconfiguration on my part which I haven't noticed
> for quite some time.  Dunno if it's worth the effort to fix that
> now, since all the commits are old (in 2016), and all are trivial.

So this all started when Alex added the contrib/gitdm/ scripts,
I noted various encoding discrepancy. Alex merged the first patch
directly as commit 1fed8f0044 ("mailmap: Add many entries to
improve 'git shortlog' statistics"), then Markus asked me to
justify each alias fixed with a commit with a combination of
(broken author email + good S-o-b tag). Then Markus gave his
R-b tag, but Alex was busy so I asked it could go via the trivial
tree. Laurent said OK but I had to split in 1 patch per person,
and each person should Ack his own line.
With this v3 I complied with all previous reviews, but I guess
I failed at explaining why/how this started. As this is an
amazing use of my time, I wanted to get over it, maybe too
quickly. So now I'll respin a v4 with more detailed explanation,
suggesting each person to either Ack/Nack each patch, then give
up.