From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 26 Apr 2019 16:25:19 +0000 (-0600)
Subject: Merge branch 'nvme-5.2' of git://git.infradead.org/nvme into for-5.2/block
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=41d7f2ed8457d38951bc73f9e6296d8340c221e2;p=openwrt%2Fstaging%2Fblogic.git

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

Pull NVMe changes from Christoph.

* 'nvme-5.2' of git://git.infradead.org/nvme:
  nvme: set 0 capacity if namespace block size exceeds PAGE_SIZE
  nvme-rdma: fix typo in struct comment
  nvme-loop: kill timeout handler
  nvme-tcp: rename function to have nvme_tcp prefix
  nvme-rdma: fix a NULL deref when an admin connect times out
  nvme-tcp: fix a NULL deref when an admin connect times out
  nvmet-tcp: don't fail maxr2t greater than 1
  nvmet-file: clamp-down file namespace lba_shift
  nvmet: include <linux/scatterlist.h>
  nvmet: return a specified error it subsys_alloc fails
  nvmet: rename nvme_completion instances from rsp to cqe
  nvmet-rdma: remove p2p_client initialization from fast-path
---

41d7f2ed8457d38951bc73f9e6296d8340c221e2