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)
* changes:
  ext4_sb.h: make feature flags in fs_info 32-bit
  ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT


Trivial merge