On Sat, 15 Feb 2025 02:44:48 +0000 Matthew Wilcox <willy@xxxxxxxxxxxxx> wrote: > 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. OK, thanks, noted. I've removed Alistair's "fs/dax: Fix ZONE_DEVICE page reference counts v7" series from mm-unstable as a new version is in the works. I could drop your "dax: use folios more widely within DAX" when Alistair's v8 is received. But then if that v8 gets re-dropped or nacked or something, your (good) patch gets lost. To avoid that possibility I suggest that Alistair redo his v8 on top of this "dax: use ..." patch.