diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-28 11:10:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-28 11:10:53 -0700 |
| commit | 6c50e1a49b4377b760ee46f824ed04b17be913e3 (patch) | |
| tree | 5e558bcd8fa3ca0d1a999e4c472d206aa688ec68 /fs/ceph/Kconfig | |
| parent | d2a97a4e99ff0ffdccd1fc46f22fb34270ef1e56 (diff) | |
| parent | 03066f23452ff088ad8e2c8acdf4443043f35b51 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: use complete_all and wake_up_all
ceph: Correct obvious typo of Kconfig variable "CRYPTO_AES"
ceph: fix dentry lease release
ceph: fix leak of dentry in ceph_init_dentry() error path
ceph: fix pg_mapping leak on pg_temp updates
ceph: fix d_release dop for snapdir, snapped dentries
ceph: avoid dcache readdir for snapdir
Diffstat (limited to 'fs/ceph/Kconfig')
| -rw-r--r-- | fs/ceph/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/Kconfig b/fs/ceph/Kconfig index 04b8280582a..bc87b9c1d27 100644 --- a/fs/ceph/Kconfig +++ b/fs/ceph/Kconfig @@ -2,7 +2,7 @@ config CEPH_FS tristate "Ceph distributed file system (EXPERIMENTAL)" depends on INET && EXPERIMENTAL select LIBCRC32C - select CONFIG_CRYPTO_AES + select CRYPTO_AES help Choose Y or M here to include support for mounting the experimental Ceph distributed file system. Ceph is an extremely |