diff --git a/[refs] b/[refs]
index dcc563480ac2..5f1c9ed2fa94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8f566b04d3cddd192cfd2418ae6d54ac6353792
+refs/heads/master: 6e6f0a1f0fa6bba1493c296eb30d1e176e1f8530
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 5dce5404eeef..80aed44e345a 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -94,7 +94,11 @@ void panic(const char *fmt, ...)
 	va_end(args);
 	printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
 #ifdef CONFIG_DEBUG_BUGVERBOSE
-	dump_stack();
+	/*
+	 * Avoid nested stack-dumping if a panic occurs during oops processing
+	 */
+	if (!oops_in_progress)
+		dump_stack();
 #endif
 
 	/*