path: root/.mailmap
diff options
authorLinus Torvalds <>2021-02-06 14:40:27 -0800
committerLinus Torvalds <>2021-02-06 14:40:27 -0800
commiteec79181212c9c2670423400a9e78bb1f0c0075d (patch)
tree394449203bd59f7e6d76574d21db37add3180c75 /.mailmap
parent860b45dae969966a52b4dd0470d8fca8479e4e4b (diff)
parentea8465e611022a04d85393f776874911a9fc0a2b (diff)
Merge tag 'block-5.11-2021-02-05' of git://
Pull block fixes from Jens Axboe: "A few small regression fixes: - NVMe pull request from Christoph: - more quirks for buggy devices (Thorsten Leemhuis, Claus Stovgaard) - update the email address for Keith (Keith Busch) - fix an out of bounds access in nvmet-tcp (Sagi Grimberg) - Regression fix for BFQ shallow depth calculations introduced in this merge window (Lin)" * tag 'block-5.11-2021-02-05' of git:// nvmet-tcp: fix out-of-bounds access when receiving multiple h2cdata PDUs bfq-iosched: Revert "bfq: Fix computation of shallow depth" update the email address for Keith Bush nvme-pci: ignore the subsysem NQN on Phison E16 nvme-pci: avoid the deepest sleep state on Kingston A2000 SSDs
Diffstat (limited to '.mailmap')
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index a90952727bc8..d674968df008 100644
--- a/.mailmap
+++ b/.mailmap
@@ -179,6 +179,8 @@ Kees Cook <> <>
Kees Cook <> <>
Kees Cook <> <>
Kees Cook <> <>
+Keith Busch <> <>
+Keith Busch <> <>
Kenneth W Chen <>
Konstantin Khlebnikov <> <>
Konstantin Khlebnikov <> <>