Merge branch 'nvme-5.2-rc2' of git://git.infradead.org/nvme into for-linus

Browse source

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

...

This commit is contained in:

Jens Axboe 2019-05-23 10:27:04 -06:00

parent 004d564f90 cb9e0e5006

commit 096c7a6d90

4 changed files with 77 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

MAINTAINERS

View file

91

drivers/nvme/host/core.c

View file

1

drivers/nvme/host/nvme.h

View file

27

drivers/nvme/host/pci.c

View file