OSDN Git Service

Merge branch 'nvme-5.2' of git://git.infradead.org/nvme into for-5.2/block
authorJens Axboe <axboe@kernel.dk>
Fri, 26 Apr 2019 16:25:19 +0000 (10:25 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 26 Apr 2019 16:25:19 +0000 (10:25 -0600)
commit41d7f2ed8457d38951bc73f9e6296d8340c221e2
treed671f1da5e2ef377bf52d6e2acfb51aa6adb6158
parentcc6be13159316e8bdcd8bbb5209315256e151337
parent01fa017484ad98fccdeaab32db0077c574b6bd6f
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