diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-06 23:40:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-06 23:40:27 +0100 |
| commit | eec79181212c9c2670423400a9e78bb1f0c0075d (patch) | |
| tree | 394449203bd59f7e6d76574d21db37add3180c75 /.mailmap | |
| parent | Merge tag 'io_uring-5.11-2021-02-05' of git://git.kernel.dk/linux-block (diff) | |
| parent | Merge branch 'nvme-5.11' of git://git.infradead.org/nvme into block-5.11 (diff) | |
| download | linux-eec79181212c9c2670423400a9e78bb1f0c0075d.tar.xz linux-eec79181212c9c2670423400a9e78bb1f0c0075d.zip | |
Merge tag 'block-5.11-2021-02-05' of git://git.kernel.dk/linux-block
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://git.kernel.dk/linux-block:
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')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -179,6 +179,8 @@ Kees Cook <keescook@chromium.org> <kees.cook@canonical.com> Kees Cook <keescook@chromium.org> <keescook@google.com> Kees Cook <keescook@chromium.org> <kees@outflux.net> Kees Cook <keescook@chromium.org> <kees@ubuntu.com> +Keith Busch <kbusch@kernel.org> <keith.busch@intel.com> +Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com> Kenneth W Chen <kenneth.w.chen@intel.com> Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru> Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com> |