On Tue, 12 Apr 2011 07:30:14 -0500 Steve French <smfrench@xxxxxxxxx> wrote: > On Tue, Apr 12, 2011 at 6:51 AM, Jeff Layton <jlayton@xxxxxxxxxx> wrote: > > On Mon, 11 Apr 2011 20:33:42 -0500 > > Steve French <smfrench@xxxxxxxxx> wrote: > > > >> Since it is already past the merge window (was waiting to discuss some > >> fixes with others at the fs summit last week before merge), ÂI shrunk > >> the list of cifs patches waiting for merge (in cifs-2.6.git) to a much > >> smaller set of more critical ones. See below. (I moved the others > >> temporarily to a for-2.6.40 branch in cifs-2.6.git). ÂWe (Jeff, > >> Shirish, I etc.) need to build/test more with this set before sending > >> though. > >> > >> Jeff Layton (8): > >> Â Â Â cifs: check for private_data before trying to put it > >> Â Â Â cifs: replace /proc/fs/cifs/Experimental with a module parm > > > > Â Â Â ÂI think we should also put in the patch that adds the > > Â Â Â Âpage_mkwrite handler. > > I agree but it had more merge conflicts. > Ok, I just resent the patch with the merge conflicts fixed. I've also given the set you're proposing + the page_mkwrite patch a quick smoke test run with connectathon and it seems to be ok. -- Jeff Layton <jlayton@xxxxxxxxxx> -- 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
