On 2026-05-28 14:20:08, Christian Brauner wrote: > On Tue, May 26, 2026 at 12:19:43PM +0200, Carlos Maiolino wrote: > > On Fri, May 22, 2026 at 02:07:57PM +0200, Christoph Hellwig wrote: > > > On Fri, May 22, 2026 at 12:03:20PM +0200, Christian Brauner wrote: > > > > > I was expecting this to come through xfs tree too if Eric and > > > > > Christian > > > > > agree. > > > > > > > > You may take it through the xfs tree if there are no conflicts with > > > > vfs-7.2.iomap. If there are I want to add the iomap changes into > > > > vfs-7.2.iomap that you can pull in. > > > > > > Merging the iomap bits through the iomap branch might make sense, given > > > that iomap usually tends to see quite a bit of activity. > > > > > > > That sounds good to me. If you want to go ahead and pull in the iomap > > bits, do so, and give me a heads up when you do it so I'll pull your > > branch locally. > > Great, can the series please be resent based on current vfs-7.2.iomap > then please? Because the iomap changes in this series don't apply > cleanly on vfs-7.2.iomap so we already have merge conflicts... >
hmm do you mean this branch? https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git/log/?h=vfs-7.2.iomap patches 07..09 seems to apply cleanly. The only conflict I see is in the overlayfs patch 03. This is because [1] (is in -rc5) is missing in vfs-7.2.iomap. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/fs/overlayfs/util.c?h=v7.1-rc5&id=0c8c88b8eb82a2a41bec5f17c076d6312dc40316 -- - Andrey _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
