On Fri, Feb 14, 2025 at 03:40:34PM -0800, Andrew Morton wrote: > > The patch titled > Subject: dax: use folios more widely within DAX > has been added to the -mm mm-unstable branch. Its filename is > dax-use-folios-more-widely-within-dax.patch I'm confused. The patch from Alistair in -next that conflicts with this looks like it comes from your tree? I don't think this patch should be included as Alistair's patchset is far more comprehensive.