On Tue, Mar 06, 2012 at 10:18:16AM -0500, Ted Ts'o wrote: > On Mon, Mar 05, 2012 at 09:08:19PM -0500, J. Bruce Fields wrote: > > Yes, that would be fine. > > > > (There may well be some conflict: simplest might be if you can get that > > pushed out to a stable public branch somewhere, hopefully before the > > merge window opens, and that'll give me a chance to pull it and handle > > any merge conflicts. > > Are the commits you're worried about on the NFS side already in > linux-next? No (though there might be some other conflicts there I haven't thought of). > If so, I'll do a quick test merge and see if there are > any conflicts. If so, I'll segregate out these patches into a > separate pre-merge branch --- and then if you like you could pull them > into your branch and we can deal with it that way. That sounds like a good way to do it regardless? --b. -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
