Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1530971
| From | Theodore Ts'o <tytso@mit.edu> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 00/29] UBIFS File Encryption v1 |
| Date | 2016-11-28 01:50 +0100 |
| Message-ID | <sIiiR-3fL-5@gated-at.bofh.it> (permalink) |
| References | <sDavD-5Ow-3@gated-at.bofh.it> <sDfOI-11Z-91@gated-at.bofh.it> <sHjTH-6yI-11@gated-at.bofh.it> <sIbU5-7vA-11@gated-at.bofh.it> <sIg7o-1WZ-17@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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@mit.edu>
Date: Sun Nov 13 22:02:22 2016 -0500
Merge branch 'fscrypt' into origin
commit a2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e
Merge: bc33b0ca11e3 9484ab1bf446
Author: Theodore Ts'o <tytso@mit.edu>
Date: Sun Nov 13 22:02:15 2016 -0500
Merge branch 'dax-4.10-iomap-pmd' into origin
Cheers,
- Ted
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: [PATCH 00/29] UBIFS File Encryption v1 Theodore Ts'o <tytso@mit.edu> - 2016-11-27 19:00 +0100
Re: [PATCH 00/29] UBIFS File Encryption v1 Richard Weinberger <richard@nod.at> - 2016-11-27 23:30 +0100
Re: [PATCH 00/29] UBIFS File Encryption v1 Theodore Ts'o <tytso@mit.edu> - 2016-11-28 01:50 +0100
Re: [PATCH 00/29] UBIFS File Encryption v1 Eric Biggers <ebiggers@google.com> - 2016-11-28 02:30 +0100
Re: [PATCH 00/29] UBIFS File Encryption v1 Theodore Ts'o <tytso@mit.edu> - 2016-11-29 03:30 +0100
csiph-web