| commit | 7ce805c97ec0eb915c73cc96ad0bb06bcf8355c0 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Jul 14 23:06:30 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jul 14 23:06:30 2017 +0000 |
| tree | 13df62df9e1a1459a55ed506fe594c580c2896d4 | |
| parent | af30023228cf90446d610bbcb89fd135d05d9bf8 [diff] | |
| parent | f266c1ab5c6e67495abc1eb18d269fcde06660b1 [diff] |
Merge changes from topic 'ext4_encryption_flag' * changes: ext4_sb.h: make feature flags in fs_info 32-bit ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT