On Mon, May 16, 2016 at 8:08 AM, Theodore Ts'o <tytso@xxxxxxx> wrote: > On Mon, May 16, 2016 at 04:26:16PM +0200, Jan Kara wrote: >> 1) Just push patches as is and have ext4 dax broken between ext4 merge and >> nvdimm merge. >> >> 2) Split out the one-line change from "dax: Remove dead zeroing code from >> fault handlers" in __dax_fault() which fixes the behavior for ext4 and >> merge it through ext4 tree. Merge the rest through nvdimm tree. > > I'm good either way, although I have a slight preference for (2). > It's really tiny preference, though, so if you or Dan want to run the > fix through the dax branch, that's fine too. Would you fold the change and trigger a rebase or just apply it on top? If just applying on top then it seems the same exposure as merging it intact through nvdimm.git. -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
