[GIT PULL] nvme updates for 4.12

[Jens Axboe]

On 04/27/2017 11:38 AM, Christoph Hellwig wrote:
> 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.

for-next is generally Linus master + block stuff. So if there are merge
issues with that, then Linus will see merge issues. Not always a
concern, but I prefer to resolve them, especially if they are
non-trivial.

-- 
Jens Axboe