diff --git a/.mailmap b/.mailmap
index eeb885837e88..6803f3bd2865 100644
--- a/.mailmap
+++ b/.mailmap
@@ -242,6 +242,10 @@ Daniele Alessandrelli <daniele.alessandrelli@gmail.com> <daniele.alessandrelli@i
 Danila Tikhonov <danila@mainlining.org> <danila@jiaxyga.com>
 Danila Tikhonov <danila@mainlining.org> <JIaxyga@protonmail.com>
 Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
+Darrick J. Wong <djwong@kernel.org> <djwong@us.ibm.com>
+Darrick J. Wong <djwong@kernel.org> <darrick.wong@oracle.com>
+Darrick J. Wong <djwong@kernel.org> <djwong@flax.djwong.org>
+Darrick J. Wong <djwong@kernel.org> <djwong@djwong.org>
 David Brownell <david-b@pacbell.net>
 David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
 David Gow <david@davidgow.net> <davidgow@google.com>
diff --git a/CREDITS b/CREDITS
index f8a33916e2a5..a1455b471051 100644
--- a/CREDITS
+++ b/CREDITS
@@ -4469,6 +4469,13 @@ S: The Netherlands
 N: Thomas Woller
 D: CS461x Cirrus Logic sound driver
 
+N: Darrick J. Wong
+E: djwong@kernel.org
+D: ext4 filesystem
+D: XFS filesystem and online fsck
+D: Various hwmon drivers
+S: USA
+
 N: David Woodhouse
 E: dwmw2@infradead.org
 D: JFFS2 file system, Memory Technology Device subsystem,