[GIT PULL] nvme updates for 4.12

[Christoph Hellwig]

On Thu, Apr 27, 2017 at 11:36:00AM -0600, Jens Axboe wrote:
> Pulled, but it threw two merge issues that I fixed up. Please double
> check them.

I saw issues vs for-next, but not vs for-4.12/block, which I assumed
was ok.

> It's queued up in the for-4.12/post-merge branch because of these
> conflicts with master.

Ok, I've got another pile that will sit on top of this..