On Sun, Nov 27, 2016 at 11:21:56PM +0100, Richard Weinberger wrote:
>
> 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?
Yep, if you pull down the dev branch from ext4.git, and run the
command:
git log --merges ext4/origin^..ext4/dev
you should see:
commit 6da22013bb7907b33c87968c25034b409a6161a2
Merge: a2f6d9c4c081 a6e089128617
Author: Theodore Ts'o <tytso@xxxxxxx>
Date: Sun Nov 13 22:02:22 2016 -0500
Merge branch 'fscrypt' into origin
commit a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e
Merge: bc33b0ca11e3 9484ab1bf446
Author: Theodore Ts'o <tytso@xxxxxxx>
Date: Sun Nov 13 22:02:15 2016 -0500
Merge branch 'dax-4.10-iomap-pmd' into origin
Cheers,
- Ted
--
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
