]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3761c3 d808b7f)
Merge branch 'nvme-5.1' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@kernel.dk>
Thu, 11 Apr 2019 15:36:41 +0000 (09:36 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 11 Apr 2019 15:36:41 +0000 (09:36 -0600)
commitc0c14e935032abd6ee6828840a83df1de49d4838
tree6e5d46c670e1ed35f4cddadfec3f7b8c563d23cbtree
parenta3761c3c91209b58b6f33bf69dd8bb8ec0c9d925commit | diff
parentd808b7f759b50acf0784ce6230ffa63e12ef465dcommit | diff
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
Ubuntu combined Linux kernel mirror