diff --git a/[refs] b/[refs]
index 2613a7824511..07cf334fa667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7337194f708bac977511c7890d7038ded187041a
+refs/heads/master: c5a37255493a3a8bf527534c8700dd73bd591fc7
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 5dc8f8028d52..eb530b4128ba 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -289,7 +289,7 @@ config WARN_STACK_SIZE
 	int "Maximum frame size considered safe (128-2048)"
 	range 128 2048
 	depends on WARN_STACK
-	default "256"
+	default "2048"
 	help
 	  This allows you to specify the maximum frame size a function may
 	  have without the compiler complaining about it.