On Sun, Nov 27, 2016 at 11:21:56PM +0100, Richard Weinberger wrote: > Ted, > > On 27.11.2016 18:52, Theodore Ts'o wrote: > > On Fri, Nov 25, 2016 at 09:18:12AM +0100, Richard Weinberger wrote: > >> > >> Do you want us to address Eric's review comments on top of the fscrypt > >> branch or shall we rebase? > >> I'd suggest the former. > > > > Yes, let's address them on top of the existing fscrypt branch. I > > don't consider any of his comments super-serious --- they were mostly > > documentation or comments level changes unless I missed something. > > Okay. Then I'll queue UBIFS encryption for the v4.10 merge window. > Just to be sure, I base my UBIFS next tree on your fscrypt tree such that > it will build fine and Linus won't see same commits with a different sha1? > Usually I'm a lucky maintainer and not have to deal with dependencies > between pull requests. :-) > > Thanks, > //richard Shouldn't the branch be rebased to remove the CONFIG_VMAP_STACK fixes which are already in Linus' tree? fscrypto: don't use on-stack buffer for key derivation fscrypto: don't use on-stack buffer for filename encryption Otherwise we'll end up with duplicate commits. Eric -- 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
