From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 11 Apr 2019 15:36:41 +0000 (-0600)
Subject: Merge branch 'nvme-5.1' of git://git.infradead.org/nvme into for-linus
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c0c14e935032abd6ee6828840a83df1de49d4838;p=android-x86%2Fkernel.git

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

Pull NVMe fixes from Christoph:

"Two nvme fixes for 5.1 - fixing the initial CSN for nvme-fc, and handle
 log page offsets properly in the target."

* 'nvme-5.1' of git://git.infradead.org/nvme:
  nvmet: fix discover log page when offsets are used
  nvme-fc: correct csn initialization and increments on error
---

c0c14e935032abd6ee6828840a83df1de49d4838