From mboxrd@z Thu Jan  1 00:00:00 1970
From: axboe@kernel.dk (Jens Axboe)
Date: Mon, 28 Aug 2017 09:55:55 -0600
Subject: [GIT PULL] nvme update for Linux 4.14
In-Reply-To: <20170828155336.GA5302@infradead.org>
References: <20170828143343.evhchzfzam3whgwm@infradead.org>
 <199590da-6ff8-24de-abca-00f23608b93b@kernel.dk>
 <20170828155336.GA5302@infradead.org>
Message-ID: <3c45e618-6a96-6443-258a-dac8f93ccc7a@kernel.dk>

On 08/28/2017 09:53 AM, Christoph Hellwig wrote:
> On Mon, Aug 28, 2017@09:51:38AM -0600, Jens Axboe wrote:
>> What is this against, exactly? It doesn't merge cleanly with my 4.14 branch.
>> >From a quick look, looks like it's conflicting with:
> 
> It was based on the nvme-3.13 tree from about two weeks ago,
> which was based on your for-linus at about that time.

Changes for 4.14 should be against the 4.14 branch. for-linus is
for 4.13. In any case, there will be a conflict against master...

-- 
Jens Axboe