From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 18 Oct 2019 14:49:25 +0000 (-0600)
Subject: Merge branch 'nvme-5.4' of git://git.infradead.org/nvme into for-linus
X-Git-Tag: v5.15~5280^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b55f0097ae1da2520108bc426275c1ec5f857b78;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull NVMe updates from Keith:

"This is a collection of bug fixes committed since the previous pull
 request that address deadlocks, double resets, memory leaks, and other
 regression."

* 'nvme-5.4' of git://git.infradead.org/nvme:
  nvme-pci: Set the prp2 correctly when using more than 4k page
  nvme-tcp: fix possible leakage during error flow
  nvmet-loop: fix possible leakage during error flow
  nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL
  nvme: Wait for reset state when required
  nvme: Prevent resets during paused controller state
  nvme: Restart request timers in resetting state
  nvme: Remove ADMIN_ONLY state
  nvme-pci: Free tagset if no IO queues
  nvme: retain split access workaround for capability reads
  nvme: fix possible deadlock when nvme_update_formats fails
---

b55f0097ae1da2520108bc426275c1ec5f857b78