On 08/28/2017 09:53 AM, Christoph Hellwig wrote: > On Mon, Aug 28, 2017 at 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
