From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2018 20:21:45 +0000 (-0700)
Subject: Merge tag 'nvme-for-4.18' of git://git.infradead.org/nvme
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=744130842193795e13ad4efcbf17f3dfb1309311;p=linux.git

Merge tag 'nvme-for-4.18' of git://git.infradead.org/nvme

Pull NVMe fixes from Christoph Hellwig:

 - fix a regression in 4.18 that causes a memory leak on probe failure
   (Keith Bush)

 - fix a deadlock in the passthrough ioctl code (Scott Bauer)

 - don't enable AENs if not supported (Weiping Zhang)

 - fix an old regression in metadata handling in the passthrough ioctl
   code (Roland Dreier)

* tag 'nvme-for-4.18' of git://git.infradead.org/nvme:
  nvme: fix handling of metadata_len for NVME_IOCTL_IO_CMD
  nvme: don't enable AEN if not supported
  nvme: ensure forward progress during Admin passthru
  nvme-pci: fix memory leak on probe failure
---

744130842193795e13ad4efcbf17f3dfb1309311