]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jan 2018 18:22:45 +0000 (10:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jan 2018 18:22:45 +0000 (10:22 -0800)
Pull NVMe fix from Jens Axboe:
 "Just a single fix for nvme over fabrics that should go into 4.15"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nvme-fabrics: initialize default host->id in nvmf_host_default()


Trivial merge