On Mon, Oct 17, 2016 at 10:47:32AM +0200, Jan Kara wrote: > This week I plan to rebase both series on top of rc1 + your THP patches so > that we can move on with merging the stuff.
Yea...so how are we going to coordinate merging of these series for the v4.10 merge window? My series mostly changes DAX, but it also changes XFS, ext2 and ext4. I think the plan right now is to have Dave Chinner take it through his XFS tree. Your first series is mostly mm changes with some DAX sprinkled in, and your second series touches dax, mm and all 3 DAX filesystems. What is the best way to handle all this? Have it go through one central tree (-MM?), even though the changes touch code that exists outside of that trees normal domain (like the FS code)? Have my series go through the XFS tree and yours through -MM, and give Linus a merge resolution patch? Something else? _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
