Re: linux-next: manual merge of the folio tree with the ubifs-fixes tree

[Richard Weinberger]

----- Ursprüngliche Mail -----
> This is now a conflict between the ubifs-fixes tree and Linus' tree.

Thanks for letting me know, I'll note this in my PR to Linus.

Thanks,
//richard