diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 22:07:20 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 22:07:20 (GMT) |
| commit | 84f8bf38b9368add916e7c335b6b94a7ae927cb1 (patch) | |
| tree | e6360985eb4866d22104c63045fc2cf789e449de /fs/cifs/Kconfig | |
| parent | e25c173379d1053f0851fa924cd608fc0b16252f (diff) | |
| parent | de47a4176c532ef5961b8a46a2d541a3517412d3 (diff) | |
| download | linux-84f8bf38b9368add916e7c335b6b94a7ae927cb1.tar.xz | |
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6:
cifs: Fix oops in session setup code for null user mounts
[CIFS] Update cifs Kconfig title to match removal of experimental dependency
cifs: fix printk format warnings
cifs: check offset in decode_ntlmssp_challenge()
cifs: NULL dereference on allocation failure
Diffstat (limited to 'fs/cifs/Kconfig')
| -rw-r--r-- | fs/cifs/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig index 0554b00..2b243af 100644 --- a/fs/cifs/Kconfig +++ b/fs/cifs/Kconfig @@ -139,7 +139,7 @@ config CIFS_DFS_UPCALL points. If unsure, say N. config CIFS_FSCACHE - bool "Provide CIFS client caching support (EXPERIMENTAL)" + bool "Provide CIFS client caching support" depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y help Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data @@ -147,7 +147,7 @@ config CIFS_FSCACHE manager. If unsure, say N. config CIFS_ACL - bool "Provide CIFS ACL support (EXPERIMENTAL)" + bool "Provide CIFS ACL support" depends on CIFS_XATTR && KEYS help Allows to fetch CIFS/NTFS ACL from the server. The DACL blob |