Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 19 insertions, 1 deletions

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 81b2c6465eeb..b5654a284fef 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,14 +1,32 @@
 menu "Distributed Lock Manager"
-        depends on INET && IP_SCTP && EXPERIMENTAL
+        depends on EXPERIMENTAL && INET
 
 config DLM
         tristate "Distributed Lock Manager (DLM)"
         depends on IPV6 || IPV6=n
         select CONFIGFS_FS
+        select IP_SCTP if DLM_SCTP
         help
         A general purpose distributed lock manager for kernel or userspace
         applications.
 
+choice
+        prompt "Select DLM communications protocol"
+        depends on DLM
+        default DLM_TCP
+        help
+        The DLM Can use TCP or SCTP for it's network communications.
+        SCTP supports multi-homed operations whereas TCP doesn't.
+        However, SCTP seems to have stability problems at the moment.
+
+config DLM_TCP
+        bool "TCP/IP"
+
+config DLM_SCTP
+        bool "SCTP"
+
+endchoice
+
 config DLM_DEBUG
         bool "DLM debugging"
         depends on DLM