diff --git a/[refs] b/[refs]
index dc3d37ee121f..ecfc6b636fa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ee189a9260849ebacbdd3caf1fd5eb077fcf6a9
+refs/heads/master: 114d1ff4f551c8cc940de71b03c5b7365b4124f5
diff --git a/trunk/arch/um/Kconfig b/trunk/arch/um/Kconfig
index b4ff2e576021..8ff3bcbce5fc 100644
--- a/trunk/arch/um/Kconfig
+++ b/trunk/arch/um/Kconfig
@@ -35,12 +35,12 @@ menu "UML-specific options"
 
 config MODE_TT
 	bool "Tracing thread support"
-	default y
+	default n
 	help
 	This option controls whether tracing thread support is compiled
-	into UML.  Normally, this should be set to Y.  If you intend to
-	use only skas mode (and the host has the skas patch applied to it),
-	then it is OK to say N here.
+	into UML.  This option is largely obsolete, given that skas0 provides
+	skas security and performance without needing to patch the host.
+	It is safe to say 'N' here.
 
 config STATIC_LINK
 	bool "Force a static link"