From: Jens Axboe <axboe@kernel.dk> Date: Fri, 3 Nov 2017 16:28:51 +0000 (-0600) Subject: Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-4.15/block X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4;p=linux.git Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-4.15/block Pull NVMe changes from Christoph: "Below are the currently queue nvme updates for Linux 4.15. There are a few more things that could make it for this merge window, but I'd like to get things into linux-next, especially for the unlikely case that Linus decided to cut -rc8. Highlights: - support for SGLs in the PCIe driver (Chaitanya Kulkarni) - disable I/O schedulers for the admin queue (Israel Rukshin) - various Fibre Channel fixes and enhancements (James Smart) - various refactoring for better code sharing between transports (Sagi Grimberg and me) as well as lots of little bits from various contributors." --- 3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4