summaryrefslogtreecommitdiff
path: root/fs/dlm/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 09:15:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 09:15:45 -0800
commit22a40fd9a60388aec8106b0baffc8f59f83bb1b4 (patch)
tree8dae550ae938aac1d1d8ce25a98ca7642d43a0df /fs/dlm/Kconfig
parentd206e09036d6201f90b2719484c8a59526c46125 (diff)
parentda8c66638ae684c99abcb30e89d2803402e7ca20 (diff)
downloadlwn-22a40fd9a60388aec8106b0baffc8f59f83bb1b4.tar.gz
lwn-22a40fd9a60388aec8106b0baffc8f59f83bb1b4.zip
Merge tag 'dlm-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland: "This set fixes some conditions in which value blocks are invalidated, and includes two trivial cleanups." * tag 'dlm-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: fix lvb invalidation conditions fs/dlm: remove CONFIG_EXPERIMENTAL dlm: remove unused variable in *dlm_lowcomms_get_buffer()
Diffstat (limited to 'fs/dlm/Kconfig')
-rw-r--r--fs/dlm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 1897eb1b4b6a..e4242c3f8486 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,6 +1,6 @@
menuconfig DLM
tristate "Distributed Lock Manager (DLM)"
- depends on EXPERIMENTAL && INET
+ depends on INET
depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n)
select IP_SCTP
help