diff options
author | Jens Axboe <axboe@kernel.dk> | 2019-04-11 18:36:41 +0300 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-04-11 18:36:41 +0300 |
commit | c0c14e935032abd6ee6828840a83df1de49d4838 (patch) | |
tree | 6e5d46c670e1ed35f4cddadfec3f7b8c563d23cb /fs | |
parent | a3761c3c91209b58b6f33bf69dd8bb8ec0c9d925 (diff) | |
parent | d808b7f759b50acf0784ce6230ffa63e12ef465d (diff) | |
download | linux-c0c14e935032abd6ee6828840a83df1de49d4838.tar.xz |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions