From: Linus Torvalds Date: Fri, 29 Oct 2010 21:15:12 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... X-Git-Tag: firefly_0821_release~7613^2~3557 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12462f2df4d10ea4f6d55b9d438ff788badec3f0;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/ecryptfs/ecryptfs-2.6 * '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() --- 12462f2df4d10ea4f6d55b9d438ff788badec3f0