From mboxrd@z Thu Jan  1 00:00:00 1970
From: hch@infradead.org (Christoph Hellwig)
Date: Thu, 27 Apr 2017 10:38:26 -0700
Subject: [GIT PULL] nvme updates for 4.12
In-Reply-To: <0d1264ff-a8b6-7df5-6d8a-572525275e0c@kernel.dk>
References: <20170427171939.tnlpqb5qmazns334@infradead.org>
 <0d1264ff-a8b6-7df5-6d8a-572525275e0c@kernel.dk>
Message-ID: <20170427173826.GA26927@infradead.org>

On Thu, Apr 27, 2017@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..