author | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 29 Oct 2010 21:15:12 +0000 (14:15 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 29 Oct 2010 21:15:12 +0000 (14:15 -0700) |
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
eCryptfs: Print mount_auth_tok_only param in ecryptfs_show_options
ecryptfs: added ecryptfs_mount_auth_tok_only mount parameter
ecryptfs: checking return code of ecryptfs_find_auth_tok_for_sig()
ecryptfs: release keys loaded in ecryptfs_keyring_auth_tok_for_sig()
eCryptfs: Clear LOOKUP_OPEN flag when creating lower file
ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()
eCryptfs: Print mount_auth_tok_only param in ecryptfs_show_options
ecryptfs: added ecryptfs_mount_auth_tok_only mount parameter
ecryptfs: checking return code of ecryptfs_find_auth_tok_for_sig()
ecryptfs: release keys loaded in ecryptfs_keyring_auth_tok_for_sig()
eCryptfs: Clear LOOKUP_OPEN flag when creating lower file
ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()
1 | 2 | |||
---|---|---|---|---|
fs/ecryptfs/ecryptfs_kernel.h | patch | | diff1 | | diff2 | | blob | history |
fs/ecryptfs/main.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc fs/ecryptfs/ecryptfs_kernel.h
Simple merge
diff --cc fs/ecryptfs/main.c
Simple merge