From ee3ff45db30c3d648de0ce0ecff390b73f7fbcb1 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Date: Tue, 5 Feb 2013 09:56:00 -0500
Subject: [PATCH] --- yaml --- r: 357696 b: refs/heads/master c:
 4c0b67a27d96e01a4b4ede2fda57da9f7c50af21 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/tools/testing/ktest/ktest.pl | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b5b788e2f27b..7671f56c4a7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6845536236a72382a20483887943a599d7c2b69
+refs/heads/master: 4c0b67a27d96e01a4b4ede2fda57da9f7c50af21
diff --git a/trunk/tools/testing/ktest/ktest.pl b/trunk/tools/testing/ktest/ktest.pl
index 839989d08dc2..f3bb5da3193b 100755
--- a/trunk/tools/testing/ktest/ktest.pl
+++ b/trunk/tools/testing/ktest/ktest.pl
@@ -1212,6 +1212,12 @@ sub reboot {
     }
 
     if (defined($time)) {
+
+	# We only want to get to the new kernel, don't fail
+	# if we stumble over a call trace.
+	my $save_ignore_errors = $ignore_errors;
+	$ignore_errors = 1;
+
 	# Look for the good kernel to boot
 	if (wait_for_monitor($time, "Linux version")) {
 	    # reboot got stuck?
@@ -1219,6 +1225,8 @@ sub reboot {
 	    run_command "$power_cycle";
 	}
 
+	$ignore_errors = $save_ignore_errors;
+
 	# Still need to wait for the reboot to finish
 	wait_for_monitor($time, $reboot_success_line);