On Wed 27-05-09 10:23:32, Theodore Tso wrote: > On Wed, May 27, 2009 at 03:00:57PM +0200, Jan Kara wrote: > > > > The series is against 2.6.30-rc7. The first two patches are just > > small cleanup and should be merged separately (Ted should have the > > ext4 cleanup rebased on top of current ext4 tree). > > So I can take the cleanup (which will be different given the changes > that are ready to get merged once the merge window opens), but it I sent you yesterday the version of the cleanup which should apply to the latest patch queue. I think you can merge it right away. In fact, this series should not depend on the cleanup in ext4 at all, I've just included it for completeness along with ext3 cleanup of the same problem (and the patch series depends on ext3 cleanup). > looks like the the second ext4 patch can't go in until we get > agreement that changes to the VFS layer should go in, correct? So > we'll have a merge order dependency here. Yes, we have to agree on VFS changes before ext4 changes make sense. > (And this one will be the 2nd merge order dependency we have in the > ext4 tree, since I also have some patches in the unstable portion of > the tree which are waiting for some tracing patches to go in.) > > OK, what I'll probably do is to merge the core VFS patch plus the 2nd > ext4 patch into the ext4 patch queue in the unstable portion of the > queue for testing purposes, but I won't actually push the VFS core > changes. We can figure out later who actually pushes the ext4 patch > which utilizes the new VFS infrastructure. Yes, that would be fine. Thanks. Luckily, the dependence is just one way (ext4 change has to go after the VFS patch) so it's just enough to merge that ext4 change some time after VFS changes go in. Honza -- Jan Kara <jack@xxxxxxx> SUSE Labs, CR -- 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