On 08/28/2017 11:57 AM, Christoph Hellwig wrote: > On Mon, Aug 28, 2017 at 10:03:39AM -0600, Jens Axboe wrote: >> But one rock is shittier than the other. If you based it against >> 4.14, then at least I only have to resolve the the problem once. >> >> The real problem is that the patch that went into master had >> cleanups too. You should push back against that, since it will >> inevitably cause problems by diverging 4.13 and 4.14 more than >> absolutely necessary. Having conflicts in nvme for the block tree >> is not isolated to this series, unfortunately. > > Given that the update doesn't appear to be in your for-next branch > yet: do you want me to rebase it and resend? Yes please. -- Jens Axboe
