On Mon, Aug 28, 2017 at 09:55:55AM -0600, Jens Axboe wrote:

quoted

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...

We would have otherwise had conflicts against changes in Linus'
tree for 4.13, so we were between a rock and a hard place here.