diff --git a/[refs] b/[refs]
index 506fb3c629ae..a9a68bd917e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69fada32d868d7f4be128ea4df8fbe4fd897fc34
+refs/heads/master: 711553efa5b8581365084cacf3585a36ca253bab
diff --git a/trunk/arch/um/Kconfig b/trunk/arch/um/Kconfig
index d75307589d74..450547a4b3be 100644
--- a/trunk/arch/um/Kconfig
+++ b/trunk/arch/um/Kconfig
@@ -25,6 +25,19 @@ config PCI
 config PCMCIA
 	bool
 
+# Yet to do!
+config TRACE_IRQFLAGS_SUPPORT
+	bool
+	default n
+
+config LOCKDEP_SUPPORT
+	bool
+	default y
+
+config STACKTRACE_SUPPORT
+	bool
+	default y
+
 config GENERIC_CALIBRATE_DELAY
 	bool
 	default y