On 11/11/2017 01:43 AM, Christoph Hellwig wrote: > Do you want to apply this forward ported version of the patch > to your for-4.15/block tree? That should at least make the conflict > go away for Linus when he pulls it. Yeah I will probably add that. I won't kill the conflict, but it'll make it more logically solvable. -- Jens Axboe