OSDN Git Service

Merge changes from topic 'ext4_encryption_flag'
authorTom Cherry <tomcherry@google.com>
Fri, 14 Jul 2017 23:06:30 +0000 (23:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 14 Jul 2017 23:06:30 +0000 (23:06 +0000)
commit7ce805c97ec0eb915c73cc96ad0bb06bcf8355c0
tree13df62df9e1a1459a55ed506fe594c580c2896d4
parentaf30023228cf90446d610bbcb89fd135d05d9bf8
parentf266c1ab5c6e67495abc1eb18d269fcde06660b1
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