Merge branch 'fscrypt' into dev

Browse source

...

This commit is contained in:

Theodore Ts'o 2016-12-12 21:50:28 -05:00

parent 0cb80b4847 6a34e4d2be

commit a551d7c8de

15 changed files with 242 additions and 221 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

106

include/linux/fscrypto.h

View file

14

include/uapi/linux/fs.h

View file