diff --git a/[refs] b/[refs]
index 13ae774bd2fe..4b9eceeb1f2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f3972168353d355854d6381f1f360ce83b723e5
+refs/heads/master: 026ee1f66aaa7f01b617a0ba89ac4b531f9603f1
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 80aed44e345a..8ed89a175d79 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -97,7 +97,7 @@ void panic(const char *fmt, ...)
 	/*
 	 * Avoid nested stack-dumping if a panic occurs during oops processing
 	 */
-	if (!oops_in_progress)
+	if (!test_taint(TAINT_DIE) && oops_in_progress <= 1)
 		dump_stack();
 #endif