diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-05-23 19:27:04 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-05-23 19:27:04 +0300 |
| commit | 096c7a6d90082586ff265d99e8e4a052dee3a403 (patch) | |
| tree | 2f1e414e20a0a9a6c0f40761851e520227807a9b /MAINTAINERS | |
| parent | 004d564f908790efe815a6510a542ac1227ef2a2 (diff) | |
| parent | cb9e0e5006064a807b5d722c7e3c42f307193792 (diff) | |
| download | linux-096c7a6d90082586ff265d99e8e4a052dee3a403.tar.xz | |
Merge branch 'nvme-5.2-rc2' of git://git.infradead.org/nvme into for-linus
Pull NVMe changes from Keith.
* 'nvme-5.2-rc2' of git://git.infradead.org/nvme:
nvme-pci: use blk-mq mapping for unmanaged irqs
nvme: update MAINTAINERS
nvme: copy MTFA field from identify controller
nvme: fix memory leak for power latency tolerance
nvme: release namespace SRCU protection before performing controller ioctls
nvme: merge nvme_ns_ioctl into nvme_ioctl
nvme: remove the ifdef around nvme_nvm_ioctl
nvme: fix srcu locking on error return in nvme_get_ns_from_disk
nvme: Fix known effects
nvme-pci: Sync queues on reset
nvme-pci: Unblock reset_work on IO failure
nvme-pci: Don't disable on timeout in reset state
nvme-pci: Fix controller freeze wait disabling
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 634f1d035767..82a9308ecb93 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11227,7 +11227,7 @@ F: drivers/video/fbdev/riva/ F: drivers/video/fbdev/nvidia/ NVM EXPRESS DRIVER -M: Keith Busch <keith.busch@intel.com> +M: Keith Busch <kbusch@kernel.org> M: Jens Axboe <axboe@fb.com> M: Christoph Hellwig <hch@lst.de> M: Sagi Grimberg <sagi@grimberg.me> |