Merge tag 'for-linus-2024042501' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/kernel-smb3] / .mailmap

diff --git a/.mailmap b/.mailmap
index f877262b0be99a588a14c1ed744ef9a79ee5c515..09fecfe78aba810602b6a226fece6272508bd3a1 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -98,6 +98,8 @@ Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
 Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
 Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
 Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
+Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
+Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
 Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>
 Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>
 Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>