aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-22 13:21:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-22 13:21:45 -0700
commit744130842193795e13ad4efcbf17f3dfb1309311 (patch)
tree7f1d37913bb28ceef44496e4a6aac1f344d6e3c8 /arch/x86
parent165ea0d1c2286f550efbf14dc3528267af088f08 (diff)
parent9b382768135ee3ff282f828c906574a8478e036b (diff)
download96b-common-744130842193795e13ad4efcbf17f3dfb1309311.tar.gz
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
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions