diff --git a/[refs] b/[refs]
index 761896070452..e67c8121e134 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c91192d66d6cea7878b8542c9d9f1873971aba92
+refs/heads/master: a27506459c5e6ccc8437fca0adb6d3759c883c28
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 7bed4ed2c519..eefef65fa584 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -411,13 +411,15 @@ sub ctx_statement_block {
 
 	my $type = '';
 	my $level = 0;
-	my @stack = ([$type, $level]);
+	my @stack = ();
 	my $p;
 	my $c;
 	my $len = 0;
 
 	my $remainder;
 	while (1) {
+		@stack = (['', 0]) if ($#stack == -1);
+
 		#warn "CSB: blk<$blk> remain<$remain>\n";
 		# If we are about to drop off the end, pull in more
 		# context.