Merge branch 'fscrypt' into origin

Browse source

...

This commit is contained in:

Theodore Ts'o 2016-11-13 22:02:22 -05:00

parent a2f6d9c4c0 a6e0891286

commit 6da22013bb

7 changed files with 124 additions and 85 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

83

fs/crypto/crypto.c

View file

57

fs/crypto/fname.c

View file

16

fs/crypto/keyinfo.c

View file

7

fs/ext4/inode.c

View file

3

fs/ext4/page-io.c

View file

5

fs/f2fs/data.c

View file

38

include/linux/fscrypto.h

View file