If it is easier - I don't mind merging it to cifs now. Seems harmless and low risk. On Thu, Aug 11, 2011 at 9:44 PM, James Morris <jmorris@xxxxxxxxx> wrote: > On Fri, 12 Aug 2011, Stephen Rothwell wrote: > >> Except then that could leave Linus' tree broken during the next merge >> window depending on the order he merges the cifs and security-testing >> trees. Unless that patch is sent to Linus as a fix patch before the next >> merge window, of course. >> >> I will add this patch as a merge fixup to the merge of the >> security-testing tree for today. And will remove my copy when one of the >> trees gets fixed. > > I'll put it in my tree, then. > >> James: maybe I should change the name of your tree in -next to just >> "security"? > > Sure. > > > -- > James Morris > <jmorris@xxxxxxxxx> > -- Thanks, Steve -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
